You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2005/10/07 08:20:41 UTC
svn commit: r307029 - in
/webservices/axis2/trunk/c/modules/xml/guththila/src: guththila_token.c
guththila_unicode.c guththila_unicode.h guththila_xml_pull_parser.c
Author: samisa
Date: Thu Oct 6 23:20:32 2005
New Revision: 307029
URL: http://svn.apache.org/viewcvs?rev=307029&view=rev
Log:
Changed the unicode naming convention stuff
Modified:
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_token.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.h
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_token.c?rev=307029&r1=307028&r2=307029&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_token.c Thu Oct 6 23:20:32 2005
@@ -233,7 +233,7 @@
char*
guththila_token_build_utf8 (unsigned int utf16_ch, int length)
{
- UTF8_char mask = 0;
+ guththila_UTF8_char mask = 0;
int ii = 0;
char *buffer = (char *) calloc (length + 1, 1);
if (length == 1)
@@ -286,7 +286,7 @@
int ii = 0;
for (ii = 0; length > ii ; )
{
- utf16_char = *((UTF16_char *)&input_buffer[ii]);
+ utf16_char = *((guththila_UTF16_char *)&input_buffer[ii]);
ii += 2;
length_utf16 = guththila_token_length_utf16 (utf16_char);
output_char = guththila_token_build_utf8 (utf16_char, length_utf16);
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.c?rev=307029&r1=307028&r2=307029&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.c Thu Oct 6 23:20:32 2005
@@ -26,19 +26,19 @@
/*! In order to determine length of UTF-16 Buffer
* Basicall char *p should be a Utf-16 Buffer */
-UTF8_char
-strlenUnicode (char *p)
+guththila_UTF8_char
+guththila_strlen_unicode (char *p)
{
- UTF8_char len = 0;
- UTF8_char d;
- UTF16_char c ;
+ guththila_UTF8_char len = 0;
+ guththila_UTF8_char d;
+ guththila_UTF16_char c ;
char* s = p;
- c = *((UTF16_char *)&s[len]);
+ c = *((guththila_UTF16_char *)&s[len]);
if (c)
{
while (c)
{
- c = *((UTF16_char *)&s[len]);
+ c = *((guththila_UTF16_char *)&s[len]);
len +=2;
d = s[len];
if(!d)
@@ -55,7 +55,7 @@
/*!To Duplicate UTF-16 String */
char *
-strdupUnicode (char* p, int length)
+guththila_strdup_unicode (char* p, int length)
{
char *s;
s = (char *)calloc (length+1, 1);
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.h?rev=307029&r1=307028&r2=307029&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_unicode.h Thu Oct 6 23:20:32 2005
@@ -18,11 +18,11 @@
*/
-#ifndef UNICODE_H
-#define UNICODE_H
+#ifndef GUTHTHILA_UNICODE_H
+#define GUTHTHILA_UNICODE_H
-typedef unsigned char UTF8_char;
-typedef unsigned short UTF16_char;
+typedef unsigned char guththila_UTF8_char;
+typedef unsigned short guththila_UTF16_char;
/*! These are the values of UTF-16 Document
* After , BOM (Byter Oreder Mark) was determined unicodeState
@@ -31,17 +31,17 @@
* LE = Little Endian UTF-16 Document
* BE = Big Endian UTF-16 Document
* For the time being Endianess make no effect to the parsing */
-enum UTF16_endianess {None=1, LE, BE};
+enum guththila_UTF16_endianess {None=1, LE, BE};
#ifdef __UNICODE__FUNCTIONS__
-#define strlen(x) strlenUnicode(x)
-#define strndup(x, y) strdupUnicode(x, y)
+#define strlen(x) guththila_strlen_unicode(x)
+#define strndup(x, y) guththila_strdup_unicode(x, y)
-UTF8_char strlenUnicode (char *);
+guththila_UTF8_char guththila_strlen_unicode (char *);
-char * strdupUnicode (char *, int);
+char * guththila_strdup_unicode (char *, int);
#endif /* __UNICODE__FUNCTIONS__ */
-#endif /* UNICODE_H */
+#endif /* GUTHTHILA_UNICODE_H */
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c?rev=307029&r1=307028&r2=307029&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c Thu Oct 6 23:20:32 2005
@@ -152,21 +152,21 @@
}
if (parser->_next == 0)
{
- UTF8_char iu = (UTF8_char) parser->buffer->buff[parser->_next++];
+ guththila_UTF8_char iu = (guththila_UTF8_char) parser->buffer->buff[parser->_next++];
if (0xff == iu
- && 0xfe == (UTF8_char) parser->buffer->buff[parser->_next++])
+ && 0xfe == (guththila_UTF8_char) parser->buffer->buff[parser->_next++])
{
parser->unicode_state = LE;
}
else if (0xfe == iu
- && 0xff == (UTF8_char) parser->buffer->buff[parser->_next++])
+ && 0xff == (guththila_UTF8_char) parser->buffer->buff[parser->_next++])
{
parser->unicode_state = BE;
}
else if (0xef == iu
- && 0xbb == (UTF8_char) parser->buffer->buff[parser->_next++]
- && 0xbf == (UTF8_char) parser->buffer->buff[parser->_next++])
+ && 0xbb == (guththila_UTF8_char) parser->buffer->buff[parser->_next++]
+ && 0xbf == (guththila_UTF8_char) parser->buffer->buff[parser->_next++])
{
parser->unicode_state = None;
}