lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

Fixed bug #153937, making sure the conversion functions return the number

Browse Source 
* encoding.c doc/examples/testWriter.c: Fixed bug #153937, making
  sure the conversion functions return the number of byte written.
  Had to fix one of the examples.
Daniel
This commit is contained in:
Daniel Veillard
2004-10-31 15:35:32 +00:00
parent e44aafb19c
commit 05f9735ba3
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Sun Oct 31 16:33:54 CET 2004 Daniel Veillard <daniel@veillard.com>
* encoding.c doc/examples/testWriter.c: Fixed bug #153937, making
sure the conversion functions return the number of byte written.
Had to fix one of the examples.
Fri Oct 29 14:16:56 CEST 2004 Daniel Veillard <daniel@veillard.com> Fri Oct 29 14:16:56 CEST 2004 Daniel Veillard <daniel@veillard.com>
* doc/xmllint.1 doc/xmllint.xml: indicate - means stdin closing #156626 * doc/xmllint.1 doc/xmllint.xml: indicate - means stdin closing #156626

4
configure.in
View File

@@ -309,7 +309,7 @@ else
CFLAGS="${CFLAGS} -fexceptions" CFLAGS="${CFLAGS} -fexceptions"
fi fi
CFLAGS="${CFLAGS} -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls" CFLAGS="${CFLAGS} -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
case "${host}" in case "${host}" in
alpha*-*-linux* ) alpha*-*-linux* )
CFLAGS="${CFLAGS} -mieee" CFLAGS="${CFLAGS} -mieee"
@@ -447,7 +447,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \
fi fi
fi fi
if test "${CC}" = "gcc" ; then if test "${CC}" = "gcc" ; then
CFLAGS="-g -O -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall" CFLAGS="-g -O -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
fi fi
STATIC_BINARIES="-static" STATIC_BINARIES="-static"
dnl -Wcast-qual -ansi dnl -Wcast-qual -ansi

4
doc/examples/testWriter.c
View File

@@ -1168,8 +1168,8 @@ ConvertInput(const char *in, const char *encoding)
if (out != 0) { if (out != 0) {
temp = size - 1; temp = size - 1;
ret = handler->input(out, &out_size, (const xmlChar *) in, &temp); ret = handler->input(out, &out_size, (const xmlChar *) in, &temp);
if (ret || temp - size + 1) { if ((ret < 0) || (temp - size + 1)) {
if (ret) { if (ret < 0) {
printf("ConvertInput: conversion wasn't successful.\n"); printf("ConvertInput: conversion wasn't successful.\n");
} else { } else {
printf printf

22
encoding.c
View File

@@ -125,7 +125,7 @@ asciiToUTF8(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = processed - base; *inlen = processed - base;
return(0); return(*outlen);
} }
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
@@ -209,7 +209,7 @@ UTF8Toascii(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = processed - instart; *inlen = processed - instart;
return(0); return(*outlen);
} }
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
@@ -255,7 +255,7 @@ isolat1ToUTF8(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - base; *inlen = in - base;
return(0); return(*outlen);
} }
/** /**
@@ -291,7 +291,7 @@ UTF8ToUTF8(unsigned char* out, int *outlen,
*outlen = len; *outlen = len;
*inlenb = len; *inlenb = len;
return(0); return(*outlen);
} }
@@ -381,7 +381,7 @@ UTF8Toisolat1(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = processed - instart; *inlen = processed - instart;
return(0); return(*outlen);
} }
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
@@ -470,7 +470,7 @@ UTF16LEToUTF8(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlenb = processed - inb; *inlenb = processed - inb;
return(0); return(*outlen);
} }
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
@@ -578,7 +578,7 @@ UTF8ToUTF16LE(unsigned char* outb, int *outlen,
} }
*outlen = (out - outstart) * 2; *outlen = (out - outstart) * 2;
*inlen = processed - instart; *inlen = processed - instart;
return(0); return(*outlen);
} }
/** /**
@@ -710,7 +710,7 @@ UTF16BEToUTF8(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlenb = processed - inb; *inlenb = processed - inb;
return(0); return(*outlen);
} }
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
@@ -815,7 +815,7 @@ UTF8ToUTF16BE(unsigned char* outb, int *outlen,
} }
*outlen = (out - outstart) * 2; *outlen = (out - outstart) * 2;
*inlen = processed - instart; *inlen = processed - instart;
return(0); return(*outlen);
} }
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
@@ -2290,7 +2290,7 @@ UTF8ToISO8859x(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - instart; *inlen = in - instart;
return(0); return(*outlen);
} }
/** /**
@@ -2350,7 +2350,7 @@ ISO8859xToUTF8(unsigned char* out, int *outlen,
} }
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - instart; *inlen = in - instart;
return (0); return (*outlen);
} }