Annotation of parser3/src/lib/patches/libxml2.patch, revision 1.1
1.1 ! paf 1: *** ../0/libxml2-2.5.1//HTMLparser.c Tue Dec 10 17:59:13 2002
! 2: --- ./HTMLparser.c Thu Jan 9 21:07:15 2003
! 3: ***************
! 4: *** 1431,1437 ****
! 5: */
! 6: int
! 7: UTF8ToHtml(unsigned char* out, int *outlen,
! 8: ! const unsigned char* in, int *inlen) {
! 9: const unsigned char* processed = in;
! 10: const unsigned char* outend;
! 11: const unsigned char* outstart = out;
! 12: --- 1431,1438 ----
! 13: */
! 14: int
! 15: UTF8ToHtml(unsigned char* out, int *outlen,
! 16: ! const unsigned char* in, int *inlen,
! 17: ! void *info) {
! 18: const unsigned char* processed = in;
! 19: const unsigned char* outend;
! 20: const unsigned char* outstart = out;
! 21: *** ../0/libxml2-2.5.1//encoding.c Tue Dec 10 17:59:37 2002
! 22: --- ./encoding.c Thu Jan 9 21:07:00 2003
! 23: ***************
! 24: *** 423,429 ****
! 25: */
! 26: static int
! 27: asciiToUTF8(unsigned char* out, int *outlen,
! 28: ! const unsigned char* in, int *inlen) {
! 29: unsigned char* outstart = out;
! 30: const unsigned char* base = in;
! 31: const unsigned char* processed = in;
! 32: --- 423,430 ----
! 33: */
! 34: static int
! 35: asciiToUTF8(unsigned char* out, int *outlen,
! 36: ! const unsigned char* in, int *inlen,
! 37: ! void *info) {
! 38: unsigned char* outstart = out;
! 39: const unsigned char* base = in;
! 40: const unsigned char* processed = in;
! 41: ***************
! 42: *** 475,481 ****
! 43: */
! 44: static int
! 45: UTF8Toascii(unsigned char* out, int *outlen,
! 46: ! const unsigned char* in, int *inlen) {
! 47: const unsigned char* processed = in;
! 48: const unsigned char* outend;
! 49: const unsigned char* outstart = out;
! 50: --- 476,483 ----
! 51: */
! 52: static int
! 53: UTF8Toascii(unsigned char* out, int *outlen,
! 54: ! const unsigned char* in, int *inlen,
! 55: ! void *info) {
! 56: const unsigned char* processed = in;
! 57: const unsigned char* outend;
! 58: const unsigned char* outstart = out;
! 59: ***************
! 60: *** 557,563 ****
! 61: */
! 62: int
! 63: isolat1ToUTF8(unsigned char* out, int *outlen,
! 64: ! const unsigned char* in, int *inlen) {
! 65: unsigned char* outstart = out;
! 66: const unsigned char* base = in;
! 67: unsigned char* outend = out + *outlen;
! 68: --- 559,566 ----
! 69: */
! 70: int
! 71: isolat1ToUTF8(unsigned char* out, int *outlen,
! 72: ! const unsigned char* in, int *inlen,
! 73: ! void *info) {
! 74: unsigned char* outstart = out;
! 75: const unsigned char* base = in;
! 76: unsigned char* outend = out + *outlen;
! 77: ***************
! 78: *** 609,615 ****
! 79: */
! 80: int
! 81: UTF8Toisolat1(unsigned char* out, int *outlen,
! 82: ! const unsigned char* in, int *inlen) {
! 83: const unsigned char* processed = in;
! 84: const unsigned char* outend;
! 85: const unsigned char* outstart = out;
! 86: --- 612,619 ----
! 87: */
! 88: int
! 89: UTF8Toisolat1(unsigned char* out, int *outlen,
! 90: ! const unsigned char* in, int *inlen,
! 91: ! void *info) {
! 92: const unsigned char* processed = in;
! 93: const unsigned char* outend;
! 94: const unsigned char* outstart = out;
! 95: ***************
! 96: *** 699,705 ****
! 97: */
! 98: static int
! 99: UTF16LEToUTF8(unsigned char* out, int *outlen,
! 100: ! const unsigned char* inb, int *inlenb)
! 101: {
! 102: unsigned char* outstart = out;
! 103: const unsigned char* processed = inb;
! 104: --- 703,710 ----
! 105: */
! 106: static int
! 107: UTF16LEToUTF8(unsigned char* out, int *outlen,
! 108: ! const unsigned char* inb, int *inlenb,
! 109: ! void *info)
! 110: {
! 111: unsigned char* outstart = out;
! 112: const unsigned char* processed = inb;
! 113: ***************
! 114: *** 783,789 ****
! 115: */
! 116: static int
! 117: UTF8ToUTF16LE(unsigned char* outb, int *outlen,
! 118: ! const unsigned char* in, int *inlen)
! 119: {
! 120: unsigned short* out = (unsigned short*) outb;
! 121: const unsigned char* processed = in;
! 122: --- 788,795 ----
! 123: */
! 124: static int
! 125: UTF8ToUTF16LE(unsigned char* outb, int *outlen,
! 126: ! const unsigned char* in, int *inlen,
! 127: ! void *info)
! 128: {
! 129: unsigned short* out = (unsigned short*) outb;
! 130: const unsigned char* processed = in;
! 131: ***************
! 132: *** 906,912 ****
! 133: */
! 134: static int
! 135: UTF16BEToUTF8(unsigned char* out, int *outlen,
! 136: ! const unsigned char* inb, int *inlenb)
! 137: {
! 138: unsigned char* outstart = out;
! 139: const unsigned char* processed = inb;
! 140: --- 912,919 ----
! 141: */
! 142: static int
! 143: UTF16BEToUTF8(unsigned char* out, int *outlen,
! 144: ! const unsigned char* inb, int *inlenb,
! 145: ! void *info)
! 146: {
! 147: unsigned char* outstart = out;
! 148: const unsigned char* processed = inb;
! 149: ***************
! 150: *** 994,1000 ****
! 151: */
! 152: static int
! 153: UTF8ToUTF16BE(unsigned char* outb, int *outlen,
! 154: ! const unsigned char* in, int *inlen)
! 155: {
! 156: unsigned short* out = (unsigned short*) outb;
! 157: const unsigned char* processed = in;
! 158: --- 1001,1008 ----
! 159: */
! 160: static int
! 161: UTF8ToUTF16BE(unsigned char* outb, int *outlen,
! 162: ! const unsigned char* in, int *inlen,
! 163: ! void *info)
! 164: {
! 165: unsigned short* out = (unsigned short*) outb;
! 166: const unsigned char* processed = in;
! 167: ***************
! 168: *** 1985,1991 ****
! 169:
! 170: if (handler->input != NULL) {
! 171: ret = handler->input(&out->content[out->use], &written,
! 172: ! in->content, &toconv);
! 173: xmlBufferShrink(in, toconv);
! 174: out->use += written;
! 175: out->content[out->use] = 0;
! 176: --- 1993,1999 ----
! 177:
! 178: if (handler->input != NULL) {
! 179: ret = handler->input(&out->content[out->use], &written,
! 180: ! in->content, &toconv, handler->inputInfo);
! 181: xmlBufferShrink(in, toconv);
! 182: out->use += written;
! 183: out->content[out->use] = 0;
! 184: ***************
! 185: *** 2069,2075 ****
! 186: }
! 187: if (handler->input != NULL) {
! 188: ret = handler->input(&out->content[out->use], &written,
! 189: ! in->content, &toconv);
! 190: xmlBufferShrink(in, toconv);
! 191: out->use += written;
! 192: out->content[out->use] = 0;
! 193: --- 2077,2083 ----
! 194: }
! 195: if (handler->input != NULL) {
! 196: ret = handler->input(&out->content[out->use], &written,
! 197: ! in->content, &toconv, handler->inputInfo);
! 198: xmlBufferShrink(in, toconv);
! 199: out->use += written;
! 200: out->content[out->use] = 0;
! 201: ***************
! 202: *** 2164,2170 ****
! 203: toconv = 0;
! 204: if (handler->output != NULL) {
! 205: ret = handler->output(&out->content[out->use], &written,
! 206: ! NULL, &toconv);
! 207: out->use += written;
! 208: out->content[out->use] = 0;
! 209: }
! 210: --- 2172,2178 ----
! 211: toconv = 0;
! 212: if (handler->output != NULL) {
! 213: ret = handler->output(&out->content[out->use], &written,
! 214: ! NULL, &toconv, handler->outputInfo);
! 215: out->use += written;
! 216: out->content[out->use] = 0;
! 217: }
! 218: ***************
! 219: *** 2195,2201 ****
! 220: }
! 221: if (handler->output != NULL) {
! 222: ret = handler->output(&out->content[out->use], &written,
! 223: ! in->content, &toconv);
! 224: xmlBufferShrink(in, toconv);
! 225: out->use += written;
! 226: writtentot += written;
! 227: --- 2203,2209 ----
! 228: }
! 229: if (handler->output != NULL) {
! 230: ret = handler->output(&out->content[out->use], &written,
! 231: ! in->content, &toconv, handler->outputInfo);
! 232: xmlBufferShrink(in, toconv);
! 233: out->use += written;
! 234: writtentot += written;
! 235: *** ../0/libxml2-2.5.1//error.c Tue Sep 10 13:47:41 2002
! 236: --- ./error.c Thu Jan 9 20:51:22 2003
! 237: ***************
! 238: *** 151,156 ****
! 239: --- 151,157 ----
! 240: int n;
! 241: xmlChar content[81];
! 242: xmlChar *ctnt;
! 243: + xmlChar curCh;
! 244:
! 245: if (input == NULL) return;
! 246: cur = input->cur;
! 247: ***************
! 248: *** 168,174 ****
! 249: n = 0;
! 250: ctnt = content;
! 251: while ((*cur != 0) && (*cur != '\n') && (*cur != '\r') && (n < 79)) {
! 252: ! *ctnt++ = *cur++;
! 253: n++;
! 254: }
! 255: *ctnt = 0;
! 256: --- 169,175 ----
! 257: n = 0;
! 258: ctnt = content;
! 259: while ((*cur != 0) && (*cur != '\n') && (*cur != '\r') && (n < 79)) {
! 260: ! *ctnt++ = ((curCh=*cur++)=='\t')?' ':curCh;
! 261: n++;
! 262: }
! 263: *ctnt = 0;
! 264: *** ../0/libxml2-2.5.1//include/libxml/HTMLparser.h Mon May 27 18:41:18 2002
! 265: --- ./include/libxml/HTMLparser.h Thu Jan 9 21:03:55 2003
! 266: ***************
! 267: *** 88,94 ****
! 268: int UTF8ToHtml (unsigned char *out,
! 269: int *outlen,
! 270: const unsigned char *in,
! 271: ! int *inlen);
! 272: int htmlEncodeEntities(unsigned char *out,
! 273: int *outlen,
! 274: const unsigned char *in,
! 275: --- 88,95 ----
! 276: int UTF8ToHtml (unsigned char *out,
! 277: int *outlen,
! 278: const unsigned char *in,
! 279: ! int *inlen,
! 280: ! void *info);
! 281: int htmlEncodeEntities(unsigned char *out,
! 282: int *outlen,
! 283: const unsigned char *in,
! 284: *** ../0/libxml2-2.5.1//include/libxml/encoding.h Tue Nov 12 12:40:18 2002
! 285: --- ./include/libxml/encoding.h Thu Jan 9 21:03:11 2003
! 286: ***************
! 287: *** 92,98 ****
! 288: * The value of @outlen after return is the number of octets consumed.
! 289: */
! 290: typedef int (* xmlCharEncodingInputFunc)(unsigned char *out, int *outlen,
! 291: ! const unsigned char *in, int *inlen);
! 292:
! 293:
! 294: /**
! 295: --- 92,99 ----
! 296: * The value of @outlen after return is the number of octets consumed.
! 297: */
! 298: typedef int (* xmlCharEncodingInputFunc)(unsigned char *out, int *outlen,
! 299: ! const unsigned char *in, int *inlen,
! 300: ! void *info);
! 301:
! 302:
! 303: /**
! 304: ***************
! 305: *** 114,120 ****
! 306: * The value of @outlen after return is the number of ocetes consumed.
! 307: */
! 308: typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
! 309: ! const unsigned char *in, int *inlen);
! 310:
! 311:
! 312: /*
! 313: --- 115,122 ----
! 314: * The value of @outlen after return is the number of ocetes consumed.
! 315: */
! 316: typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
! 317: ! const unsigned char *in, int *inlen,
! 318: ! void *info);
! 319:
! 320:
! 321: /*
! 322: ***************
! 323: *** 126,133 ****
! 324: typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
! 325: struct _xmlCharEncodingHandler {
! 326: char *name;
! 327: ! xmlCharEncodingInputFunc input;
! 328: ! xmlCharEncodingOutputFunc output;
! 329: #ifdef LIBXML_ICONV_ENABLED
! 330: iconv_t iconv_in;
! 331: iconv_t iconv_out;
! 332: --- 128,135 ----
! 333: typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
! 334: struct _xmlCharEncodingHandler {
! 335: char *name;
! 336: ! xmlCharEncodingInputFunc input; void *inputInfo;
! 337: ! xmlCharEncodingOutputFunc output; void *outputInfo;
! 338: #ifdef LIBXML_ICONV_ENABLED
! 339: iconv_t iconv_in;
! 340: iconv_t iconv_out;
! 341: ***************
! 342: *** 196,206 ****
! 343: int UTF8Toisolat1 (unsigned char *out,
! 344: int *outlen,
! 345: const unsigned char *in,
! 346: ! int *inlen);
! 347: int isolat1ToUTF8 (unsigned char *out,
! 348: int *outlen,
! 349: const unsigned char *in,
! 350: ! int *inlen);
! 351: int xmlGetUTF8Char (const unsigned char *utf,
! 352: int *len);
! 353: /*
! 354: --- 198,210 ----
! 355: int UTF8Toisolat1 (unsigned char *out,
! 356: int *outlen,
! 357: const unsigned char *in,
! 358: ! int *inlen,
! 359: ! void *info);
! 360: int isolat1ToUTF8 (unsigned char *out,
! 361: int *outlen,
! 362: const unsigned char *in,
! 363: ! int *inlen,
! 364: ! void *info);
! 365: int xmlGetUTF8Char (const unsigned char *utf,
! 366: int *len);
! 367: /*
E-mail:
![[BACK]](/cvsweb/icons/back.gif){kind=icon}
Return to libxml2.patch CVS log ![[TXT]](/cvsweb/icons/text.gif){kind=icon}
![[DIR]](/cvsweb/icons/dir.gif){kind=icon}
Up to [parser3project] / parser3 / src / lib / patches