summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2002-11-05 15:22:48 +0000
committerStephan Bergmann <sb@openoffice.org>2002-11-05 15:22:48 +0000
commitce89045d8b35012cb272e721e3158129796aa25c (patch)
tree02f70303a155e691d6b8f9d701ef907630e335cc
parent9953023af88b2a8ba0084095486df8ef80a4b956 (diff)
#104568# Added missing SAL_CALL.
-rw-r--r--sal/inc/rtl/uri.h32
-rw-r--r--sal/rtl/source/uri.cxx25
2 files changed, 29 insertions, 28 deletions
diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h
index 99e88b4f2..cbf090e16 100644
--- a/sal/inc/rtl/uri.h
+++ b/sal/inc/rtl/uri.h
@@ -2,9 +2,9 @@
*
* $RCSfile: uri.h,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: sb $ $Date: 2002-09-24 10:15:18 $
+ * last change: $Author: sb $ $Date: 2002-11-05 16:22:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -238,7 +238,7 @@ rtl_UriDecodeMechanism;
@return
An array of 128 booleans, to be used in calls to rtl_uriEncode().
*/
-sal_Bool const * rtl_getUriCharClass(rtl_UriCharClass eCharClass)
+sal_Bool const * SAL_CALL rtl_getUriCharClass(rtl_UriCharClass eCharClass)
SAL_THROW_EXTERN_C();
/** Encode a text as (part of) a URI.
@@ -271,11 +271,11 @@ sal_Bool const * rtl_getUriCharClass(rtl_UriCharClass eCharClass)
Returns an encoded representation of the input text. Must itself not be
null, and must point to either null or a valid string.
*/
-void rtl_uriEncode(rtl_uString * pText,
- sal_Bool const * pCharClass,
- rtl_UriEncodeMechanism eMechanism,
- rtl_TextEncoding eCharset,
- rtl_uString ** pResult)
+void SAL_CALL rtl_uriEncode(rtl_uString * pText,
+ sal_Bool const * pCharClass,
+ rtl_UriEncodeMechanism eMechanism,
+ rtl_TextEncoding eCharset,
+ rtl_uString ** pResult)
SAL_THROW_EXTERN_C();
/** Decode (a part of) a URI.
@@ -303,10 +303,10 @@ void rtl_uriEncode(rtl_uString * pText,
Returns a decoded representation of the input text. Must itself not be
null, and must point to either null or a valid string.
*/
-void rtl_uriDecode(rtl_uString * pText,
- rtl_UriDecodeMechanism eMechanism,
- rtl_TextEncoding eCharset,
- rtl_uString ** pResult)
+void SAL_CALL rtl_uriDecode(rtl_uString * pText,
+ rtl_UriDecodeMechanism eMechanism,
+ rtl_TextEncoding eCharset,
+ rtl_uString ** pResult)
SAL_THROW_EXTERN_C();
/** Convert a relative URI reference into an absolute one.
@@ -351,10 +351,10 @@ void rtl_uriDecode(rtl_uString * pText,
@return
True if no exception is signalled, otherwise false.
*/
-sal_Bool rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
- rtl_uString * pRelUriRef,
- rtl_uString ** pResult,
- rtl_uString ** pException)
+sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
+ rtl_uString * pRelUriRef,
+ rtl_uString ** pResult,
+ rtl_uString ** pException)
SAL_THROW_EXTERN_C();
#if defined __cplusplus
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 4415606c5..9a3a79098 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: uri.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: sb $ $Date: 2002-10-08 07:49:12 $
+ * last change: $Author: sb $ $Date: 2002-11-05 16:22:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -468,7 +468,7 @@ rtl::OUString joinPaths(Component const & rBasePath, Component const & rRelPath)
}
-sal_Bool const * rtl_getUriCharClass(rtl_UriCharClass eCharClass)
+sal_Bool const * SAL_CALL rtl_getUriCharClass(rtl_UriCharClass eCharClass)
SAL_THROW_EXTERN_C()
{
static sal_Bool const aCharClass[][nCharClassSize]
@@ -549,9 +549,9 @@ sal_Bool const * rtl_getUriCharClass(rtl_UriCharClass eCharClass)
return aCharClass[eCharClass];
}
-void rtl_uriEncode(rtl_uString * pText, sal_Bool const * pCharClass,
- rtl_UriEncodeMechanism eMechanism, rtl_TextEncoding eCharset,
- rtl_uString ** pResult)
+void SAL_CALL rtl_uriEncode(rtl_uString * pText, sal_Bool const * pCharClass,
+ rtl_UriEncodeMechanism eMechanism,
+ rtl_TextEncoding eCharset, rtl_uString ** pResult)
SAL_THROW_EXTERN_C()
{
OSL_ENSURE(!pCharClass[0x25], "bad pCharClass");
@@ -593,8 +593,9 @@ void rtl_uriEncode(rtl_uString * pText, sal_Bool const * pCharClass,
}
}
-void rtl_uriDecode(rtl_uString * pText, rtl_UriDecodeMechanism eMechanism,
- rtl_TextEncoding eCharset, rtl_uString ** pResult)
+void SAL_CALL rtl_uriDecode(rtl_uString * pText,
+ rtl_UriDecodeMechanism eMechanism,
+ rtl_TextEncoding eCharset, rtl_uString ** pResult)
SAL_THROW_EXTERN_C()
{
switch (eMechanism)
@@ -643,10 +644,10 @@ void rtl_uriDecode(rtl_uString * pText, rtl_UriDecodeMechanism eMechanism,
}
}
-sal_Bool rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
- rtl_uString * pRelUriRef,
- rtl_uString ** pResult,
- rtl_uString ** pException)
+sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
+ rtl_uString * pRelUriRef,
+ rtl_uString ** pResult,
+ rtl_uString ** pException)
SAL_THROW_EXTERN_C()
{
// If pRelUriRef starts with a scheme component it is an absolute URI