CVS update: php3/functions

Date: Monday February 8, 1999 @ 10:53 Author: rasmus Update of /repository/php3/functions In directory asf:/home/rasmus/php3/functions Modified Files: php3_xml.h xml.c Log Message: I'm pretty sure we need an unsigned char throughout here. Stig, please doublecheck this patch. Index: php3/functions/php3_xml.h diff -c php3/functions/php3_xml.h:1.9 php3/functions/php3_xml.h:1.10 *** php3/functions/php3_xml.h:1.9 Sat Jan 16 07:00:54 1999 --- php3/functions/php3_xml.h Mon Feb 8 10:53:00 1999 *************** *** 67,73 **** typedef struct { XML_Char *name; char (*decoding_function)(unsigned short); ! unsigned short (*encoding_function)(char); } xml_encoding; --- 67,73 ---- typedef struct { XML_Char *name; char (*decoding_function)(unsigned short); ! unsigned short (*encoding_function)(unsigned char); } xml_encoding; Index: php3/functions/xml.c diff -c php3/functions/xml.c:1.21 php3/functions/xml.c:1.22 *** php3/functions/xml.c:1.21 Fri Jan 15 06:14:41 1999 --- php3/functions/xml.c Mon Feb 8 10:53:01 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: xml.c,v 1.21 1999/01/15 11:14:41 ssb Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # if PHP_31 --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: xml.c,v 1.22 1999/02/08 15:53:01 rasmus Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # if PHP_31 *************** *** 111,117 **** static void xml_set_handler(char **, pval *); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); ! inline static unsigned short xml_encode_us_ascii(char); inline static char xml_decode_us_ascii(unsigned short); static XML_Char *xml_utf8_encode(const char *, int, int *, const XML_Char *); static char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *); --- 111,117 ---- static void xml_set_handler(char **, pval *); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); ! inline static unsigned short xml_encode_us_ascii(unsigned char); inline static char xml_decode_us_ascii(unsigned short); static XML_Char *xml_utf8_encode(const char *, int, int *, const XML_Char *); static char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *); *************** *** 421,427 **** /* {{{ xml_encode_us_ascii() */ inline static unsigned short ! xml_encode_us_ascii(char c) { return (unsigned short)c; } --- 421,427 ---- /* {{{ xml_encode_us_ascii() */ inline static unsigned short ! xml_encode_us_ascii(unsigned char c) { return (unsigned short)c; } *************** *** 460,466 **** int pos = len; char *newbuf; unsigned short c; ! unsigned short (*encoder)(char) = NULL; xml_encoding *enc = xml_get_encoding(encoding); *newlen = 0; --- 460,466 ---- int pos = len; char *newbuf; unsigned short c; ! unsigned short (*encoder)(unsigned char) = NULL; xml_encoding *enc = xml_get_encoding(encoding); *newlen = 0; -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net