Annotation of parser3/src/patches/libxml_transcoder_context3.patch, revision 1.1
1.1 ! paf 1: --- encoding.c.0 Sun Nov 4 23:23:38 2001
! 2: +++ encoding.c Fri Dec 28 18:32:12 2001
! 3: @@ -422,7 +422,8 @@
! 4: */
! 5: static int
! 6: asciiToUTF8(unsigned char* out, int *outlen,
! 7: - const unsigned char* in, int *inlen) {
! 8: + const unsigned char* in, int *inlen,
! 9: + void *info) {
! 10: unsigned char* outstart = out;
! 11: const unsigned char* base = in;
! 12: const unsigned char* processed = in;
! 13: @@ -474,7 +475,8 @@
! 14: */
! 15: static int
! 16: UTF8Toascii(unsigned char* out, int *outlen,
! 17: - const unsigned char* in, int *inlen) {
! 18: + const unsigned char* in, int *inlen,
! 19: + void *info) {
! 20: const unsigned char* processed = in;
! 21: const unsigned char* outend;
! 22: const unsigned char* outstart = out;
! 23: @@ -556,7 +558,8 @@
! 24: */
! 25: int
! 26: isolat1ToUTF8(unsigned char* out, int *outlen,
! 27: - const unsigned char* in, int *inlen) {
! 28: + const unsigned char* in, int *inlen,
! 29: + void *info) {
! 30: unsigned char* outstart = out;
! 31: const unsigned char* base = in;
! 32: const unsigned char* processed = in;
! 33: @@ -605,7 +608,8 @@
! 34: */
! 35: int
! 36: UTF8Toisolat1(unsigned char* out, int *outlen,
! 37: - const unsigned char* in, int *inlen) {
! 38: + const unsigned char* in, int *inlen,
! 39: + void *info) {
! 40: const unsigned char* processed = in;
! 41: const unsigned char* outend;
! 42: const unsigned char* outstart = out;
! 43: @@ -695,7 +699,8 @@
! 44: */
! 45: static int
! 46: UTF16LEToUTF8(unsigned char* out, int *outlen,
! 47: - const unsigned char* inb, int *inlenb)
! 48: + const unsigned char* inb, int *inlenb,
! 49: + void *info)
! 50: {
! 51: unsigned char* outstart = out;
! 52: const unsigned char* processed = inb;
! 53: @@ -779,7 +784,8 @@
! 54: */
! 55: static int
! 56: UTF8ToUTF16LE(unsigned char* outb, int *outlen,
! 57: - const unsigned char* in, int *inlen)
! 58: + const unsigned char* in, int *inlen,
! 59: + void *info)
! 60: {
! 61: unsigned short* out = (unsigned short*) outb;
! 62: const unsigned char* processed = in;
! 63: @@ -902,7 +908,8 @@
! 64: */
! 65: static int
! 66: UTF16BEToUTF8(unsigned char* out, int *outlen,
! 67: - const unsigned char* inb, int *inlenb)
! 68: + const unsigned char* inb, int *inlenb,
! 69: + void *info)
! 70: {
! 71: unsigned char* outstart = out;
! 72: const unsigned char* processed = inb;
! 73: @@ -990,7 +997,8 @@
! 74: */
! 75: static int
! 76: UTF8ToUTF16BE(unsigned char* outb, int *outlen,
! 77: - const unsigned char* in, int *inlen)
! 78: + const unsigned char* in, int *inlen,
! 79: + void *info)
! 80: {
! 81: unsigned short* out = (unsigned short*) outb;
! 82: const unsigned char* processed = in;
! 83: @@ -1979,7 +1987,7 @@
! 84:
! 85: if (handler->input != NULL) {
! 86: ret = handler->input(&out->content[out->use], &written,
! 87: - in->content, &toconv);
! 88: + in->content, &toconv, handler->inputInfo);
! 89: xmlBufferShrink(in, toconv);
! 90: out->use += written;
! 91: out->content[out->use] = 0;
! 92: @@ -2063,7 +2071,7 @@
! 93: }
! 94: if (handler->input != NULL) {
! 95: ret = handler->input(&out->content[out->use], &written,
! 96: - in->content, &toconv);
! 97: + in->content, &toconv, handler->inputInfo);
! 98: xmlBufferShrink(in, toconv);
! 99: out->use += written;
! 100: out->content[out->use] = 0;
! 101: @@ -2158,7 +2166,7 @@
! 102: toconv = 0;
! 103: if (handler->output != NULL) {
! 104: ret = handler->output(&out->content[out->use], &written,
! 105: - NULL, &toconv);
! 106: + NULL, &toconv, handler->outputInfo);
! 107: out->use += written;
! 108: out->content[out->use] = 0;
! 109: }
! 110: @@ -2189,7 +2197,7 @@
! 111: }
! 112: if (handler->output != NULL) {
! 113: ret = handler->output(&out->content[out->use], &written,
! 114: - in->content, &toconv);
! 115: + in->content, &toconv, handler->outputInfo);
! 116: xmlBufferShrink(in, toconv);
! 117: out->use += written;
! 118: writtentot += written;
E-mail: