1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

further small changes for warnings when configured with --with-iconv=no

* encoding.c: further small changes for warnings when
  configured with --with-iconv=no
This commit is contained in:
William M. Brack
2003-08-07 13:12:49 +00:00
parent a71a8ef127
commit 16db7b6ee4
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Thu Aug 7 21:13:22 HKT 2003 William Brack <wbrack@mmm.com.hk>
* encoding.c: further small changes for warnings when
configured with --with-iconv=no
Wed Aug 6 12:32:11 HKT 2003 William Brack <wbrack@mmm.com.hk> Wed Aug 6 12:32:11 HKT 2003 William Brack <wbrack@mmm.com.hk>
* error.c trionan.[ch] testThreads.c python/generator.py: * error.c trionan.[ch] testThreads.c python/generator.py:

View File

@ -65,6 +65,10 @@ static int xmlCharEncodingAliasesMax = 0;
#if 0 #if 0
#define DEBUG_ENCODING /* Define this to get encoding traces */ #define DEBUG_ENCODING /* Define this to get encoding traces */
#endif #endif
#else
#ifdef LIBXML_ISO8859X_ENABLED
static void xmlRegisterCharEncodingHandlersISO8859x (void);
#endif
#endif #endif
static int xmlLittleEndian = 1; static int xmlLittleEndian = 1;
@ -2491,7 +2495,7 @@ UTF8ToISO8859x(unsigned char* out, int *outlen,
return(-2); return(-2);
} }
c = *in++; c = *in++;
if (c & 0xC0 != 0xC0) { if ((c & 0xC0) != 0xC0) {
/* not a trailing byte */ /* not a trailing byte */
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - instart - 2; *inlen = in - instart - 2;
@ -2517,14 +2521,14 @@ UTF8ToISO8859x(unsigned char* out, int *outlen,
return(-2); return(-2);
} }
c1 = *in++; c1 = *in++;
if (c1 & 0xC0 != 0xC0) { if ((c1 & 0xC0) != 0xC0) {
/* not a trailing byte (c1) */ /* not a trailing byte (c1) */
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - instart - 2; *inlen = in - instart - 2;
return(-2); return(-2);
} }
c2 = *in++; c2 = *in++;
if (c2 & 0xC0 != 0xC0) { if ((c2 & 0xC0) != 0xC0) {
/* not a trailing byte (c2) */ /* not a trailing byte (c2) */
*outlen = out - outstart; *outlen = out - outstart;
*inlen = in - instart - 2; *inlen = in - instart - 2;