wrowe 2002/07/16 22:24:04
Modified: include apr_xlate.h
xlate xlate.c
Log:
APU declares now
Revision Changes Path
1.2 +7 -7 apr-util/include/apr_xlate.h
Index: apr_xlate.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_xlate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_xlate.h 17 Jul 2002 05:15:17 -0000 1.1
+++ apr_xlate.h 17 Jul 2002 05:24:04 -0000 1.2
@@ -106,7 +106,7 @@
* names to indicate the charset of the current locale.
* </PRE>
*/
-APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset,
+APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset,
const char *topage,
const char *frompage,
apr_pool_t *pool);
@@ -130,10 +130,10 @@
* parameters of conversion
* @param onoff Output: whether or not the conversion is single-byte-only
*/
-APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff);
+APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff);
/** @deprecated @see apr_xlate_sb_get */
-APR_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
+APU_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
/**
* Convert a buffer of text from one codepage to another.
@@ -146,7 +146,7 @@
* @param outbytes_left Input: the size of the output buffer
* Output: the amount of the output buffer not yet used
*/
-APR_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset,
+APU_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset,
const char *inbuf,
apr_size_t *inbytes_left,
char *outbuf,
@@ -163,7 +163,7 @@
* @param inchar The character to convert
* @param outchar The converted character
*/
-APR_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset,
+APU_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset,
char inchar, char outchar);
#endif
@@ -175,14 +175,14 @@
* @warning This only works when converting between single-byte character
sets.
* -1 will be returned if the conversion can't be performed.
*/
-APR_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset,
+APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset,
unsigned char inchar);
/**
* Close a codepage translation handle.
* @param convset The codepage translation handle to close
*/
-APR_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset);
+APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset);
/** @} */
#ifdef __cplusplus
1.3 +17 -12 apr-util/xlate/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr-util/xlate/xlate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xlate.c 17 Jul 2002 05:20:44 -0000 1.2
+++ xlate.c 17 Jul 2002 05:24:04 -0000 1.3
@@ -226,8 +226,10 @@
convset->sbcs_table[i] = i;
}
-apr_status_t apr_xlate_open(apr_xlate_t **convset, const char *topage,
- const char *frompage, apr_pool_t *pool)
+APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset,
+ const char *topage,
+ const char *frompage,
+ apr_pool_t *pool)
{
apr_status_t status;
apr_xlate_t *new;
@@ -296,9 +298,11 @@
return APR_SUCCESS;
}
-apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf,
- apr_size_t *inbytes_left, char *outbuf,
- apr_size_t *outbytes_left)
+APU_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset,
+ const char *inbuf,
+ apr_size_t *inbytes_left,
+ char *outbuf,
+ apr_size_t *outbytes_left)
{
apr_status_t status = APR_SUCCESS;
#ifdef HAVE_ICONV
@@ -359,7 +363,8 @@
return status;
}
-apr_int32_t apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar)
+APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset,
+ unsigned char inchar)
{
if (convset->sbcs_table) {
return convset->sbcs_table[inchar];
@@ -369,14 +374,14 @@
}
}
-apr_status_t apr_xlate_close(apr_xlate_t *convset)
+APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset)
{
return apr_pool_cleanup_run(convset->pool, convset, apr_xlate_cleanup);
}
#else /* !APR_HAS_XLATE */
-APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset,
+APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset,
const char *topage,
const char *frompage,
apr_pool_t *pool)
@@ -384,12 +389,12 @@
return APR_ENOTIMPL;
}
-APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff)
+APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff)
{
return APR_ENOTIMPL;
}
-APR_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset,
+APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset,
unsigned char inchar)
{
return (-1);
@@ -404,7 +409,7 @@
return APR_ENOTIMPL;
}
-APR_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset)
+APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset)
{
return APR_ENOTIMPL;
}
@@ -413,7 +418,7 @@
/* Deprecated
*/
-APR_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff)
+APU_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff)
{
return apr_xlate_sb_get(convset, onoff);
}
