You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/03/24 05:06:23 UTC
cvs commit: apr-iconv/lib iconv.h
wrowe 01/03/23 20:06:23
Modified: . CHANGES
ces _tbl_simple.c iso-10646-ucs-2.c iso-10646-ucs-4.c
ucs2-internal.c ucs4-internal.c unicode-1-1-utf-7.c
utf-16.c
lib iconv.h
Log:
*) First set of changes for APR compatibility (eliminated __inline).
[jean-frederic clere <jf...@fujitsu-siemens.com>]
Revision Changes Path
1.2 +5 -0 apr-iconv/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-iconv/CHANGES,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CHANGES 2000/12/10 19:20:28 1.1
+++ CHANGES 2001/03/24 04:06:22 1.2
@@ -1,3 +1,8 @@
+Changes with APR-ICONV a15
+
+ *) First set of changes for APR compatibility (eliminated __inline).
+ [jean-frederic clere <jf...@fujitsu-siemens.com>]
+
Changes with APR-ICONV a9
*) Source moved from the apr library into it's own repository
1.2 +1 -1 apr-iconv/ces/_tbl_simple.c
Index: _tbl_simple.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/_tbl_simple.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _tbl_simple.c 2000/11/20 19:00:20 1.1
+++ _tbl_simple.c 2001/03/24 04:06:22 1.2
@@ -47,7 +47,7 @@
return ((struct iconv_ccs_desc *)(ces->data))->names;
}
-static __inline int
+static APR_INLINE int
table_nbits(struct iconv_ces *ces)
{
return ((struct iconv_ccs_desc *)(ces->data))->nbits;
1.2 +1 -1 apr-iconv/ces/iso-10646-ucs-2.c
Index: iso-10646-ucs-2.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/iso-10646-ucs-2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iso-10646-ucs-2.c 2000/11/20 19:00:20 1.1
+++ iso-10646-ucs-2.c 2001/03/24 04:06:22 1.2
@@ -70,7 +70,7 @@
return 1;
}
-static __inline ucs_t
+static APR_INLINE ucs_t
msb(const unsigned char *buf)
{
return (buf[0] << 8) | buf[1];
1.2 +1 -1 apr-iconv/ces/iso-10646-ucs-4.c
Index: iso-10646-ucs-4.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/iso-10646-ucs-4.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iso-10646-ucs-4.c 2000/11/20 19:00:20 1.1
+++ iso-10646-ucs-4.c 2001/03/24 04:06:22 1.2
@@ -72,7 +72,7 @@
return 1;
}
-static __inline ucs_t
+static APR_INLINE ucs_t
msb(const unsigned char *buf)
{
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
1.2 +1 -1 apr-iconv/ces/ucs2-internal.c
Index: ucs2-internal.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/ucs2-internal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ucs2-internal.c 2000/11/20 19:00:20 1.1
+++ ucs2-internal.c 2001/03/24 04:06:22 1.2
@@ -43,7 +43,7 @@
return names;
}
-static __inline int
+static APR_INLINE int
ucs2_nbytes(struct iconv_ces *ces)
{
return sizeof(ucs2_t);
1.2 +1 -1 apr-iconv/ces/ucs4-internal.c
Index: ucs4-internal.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/ucs4-internal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ucs4-internal.c 2000/11/20 19:00:20 1.1
+++ ucs4-internal.c 2001/03/24 04:06:22 1.2
@@ -43,7 +43,7 @@
return names;
}
-static __inline int
+static APR_INLINE int
ucs4_nbytes(struct iconv_ces *ces)
{
return sizeof(ucs4_t);
1.2 +2 -2 apr-iconv/ces/unicode-1-1-utf-7.c
Index: unicode-1-1-utf-7.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/unicode-1-1-utf-7.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unicode-1-1-utf-7.c 2000/11/20 19:00:20 1.1
+++ unicode-1-1-utf-7.c 2001/03/24 04:06:22 1.2
@@ -47,7 +47,7 @@
return names;
}
-static inline int
+static APR_INLINE int
lackofbytes(int bytes, size_t *bytesleft)
{
if (bytes > *bytesleft)
@@ -62,7 +62,7 @@
#define base64(ch) (base64_str[(ch) & 0x3F])
-static inline int output(char ch, unsigned char **outbuf)
+static APR_INLINE int output(char ch, unsigned char **outbuf)
{
*(*outbuf)++ = ch;
return 1;
1.2 +1 -1 apr-iconv/ces/utf-16.c
Index: utf-16.c
===================================================================
RCS file: /home/cvs/apr-iconv/ces/utf-16.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- utf-16.c 2000/11/20 19:00:20 1.1
+++ utf-16.c 2001/03/24 04:06:22 1.2
@@ -81,7 +81,7 @@
return 1;
}
-static __inline ucs_t
+static APR_INLINE ucs_t
msb(const unsigned char *buf)
{
return (buf[0] << 8) | buf[1];
1.2 +9 -19 apr-iconv/lib/iconv.h
Index: iconv.h
===================================================================
RCS file: /home/cvs/apr-iconv/lib/iconv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iconv.h 2000/11/20 19:00:20 1.1
+++ iconv.h 2001/03/24 04:06:23 1.2
@@ -34,19 +34,22 @@
#include <sys/types.h> /* size_t */
#include <stddef.h> /* NULL */
+#include <inttypes.h>
+#include "apr.h"
+
/*
* iconv_t: charset conversion descriptor type
*/
typedef void *iconv_t;
-__BEGIN_DECLS
+/* __BEGIN_DECLS */
iconv_t iconv_open(const char *, const char *);
size_t iconv(iconv_t, const char **, size_t *, char **, size_t *);
int iconv_close(iconv_t);
-__END_DECLS
+/* __END_DECLS */
#ifdef ICONV_INTERNAL
@@ -192,19 +195,19 @@
/*
* inline functions for use in charset conversion modules
*/
-static __inline ucs2_t
+static APR_INLINE ucs2_t
iconv_ccs_convert_7bit(const iconv_ccs_convtable *table, ucs2_t ch)
{
return ch & 0x80 ? UCS_CHAR_INVALID : table->_7bit.data[ch];
}
-static __inline ucs2_t
+static APR_INLINE ucs2_t
iconv_ccs_convert_8bit(const iconv_ccs_convtable *table, ucs2_t ch)
{
return table->_8bit.data[ch];
}
-static __inline ucs2_t
+static APR_INLINE ucs2_t
iconv_ccs_convert_14bit(const iconv_ccs_convtable *table, ucs2_t ch)
{
const iconv_ccs_convtable_7bit *sub_table;
@@ -213,7 +216,7 @@
return sub_table ? sub_table->data[ch & 0x7F] : UCS_CHAR_INVALID;
}
-static __inline ucs2_t
+static APR_INLINE ucs2_t
iconv_ccs_convert_16bit(const iconv_ccs_convtable *table, ucs2_t ch)
{
const iconv_ccs_convtable_8bit *sub_table;
@@ -325,19 +328,6 @@
ICONV_CES_DRIVER_DECL(iso2022);
-
-#ifdef ICONV_DEBUG
-void iconv_debug(const char *file, int line, const char *function,
- const char *format, ...);
-#define idebug(format, args...) \
- iconv_debug(__FILE__, __LINE__, __FUNCTION__, format , ## args)
-#include <err.h>
-#define iconv_warnx(format, args...) \
- warnx(__FUNCTION__ # format , ## args)
-#else
-#define idebug(format, args...)
-#define iconv_warnx(format, args...)
-#endif
int iconv_mod_load(const char *, int, const void *, struct iconv_module **);
int iconv_mod_unload(struct iconv_module *);