fielding 01/01/28 03:33:55
Modified: i18n/unix xlate.c
include apr_xlate.h
Log:
Revert last change and solve warning by explicit cast. The need would
have been obvious if dependencies were in the Makefile.
Revision Changes Path
1.18 +2 -2 apr/i18n/unix/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr/i18n/unix/xlate.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xlate.c 2001/01/28 09:50:00 1.17
+++ xlate.c 2001/01/28 11:33:52 1.18
@@ -276,7 +276,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, char *inbuf,
+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)
{
@@ -285,7 +285,7 @@
size_t translated;
if (convset->ich != (iconv_t)-1) {
- char *inbufptr = inbuf;
+ char *inbufptr = (char *)inbuf;
char *outbufptr = outbuf;
translated = iconv(convset->ich, &inbufptr,
1.14 +2 -2 apr/include/apr_xlate.h
Index: apr_xlate.h
===================================================================
RCS file: /home/cvs/apr/include/apr_xlate.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr_xlate.h 2001/01/28 09:50:01 1.13
+++ apr_xlate.h 2001/01/28 11:33:54 1.14
@@ -126,10 +126,10 @@
* @param outbuf The address of the destination buffer
* @param outbytes_left Input: the size of the output buffer
* Output: the amount of the output buffer not yet used
- * @deffunc apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, char
*inbuf, apr_size_t *inbytes_left, char *outbuf, apr_size_t *outbytes_left)
+ * @deffunc 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_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset,
- char *inbuf,
+ const char *inbuf,
apr_size_t *inbytes_left,
char *outbuf,
apr_size_t *outbytes_left);
