mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-07-29 11:41:22 +03:00
Cleanup, patch from Wayne Davison:
- xmlIO.h tree.h: made xmlNodeDump() and xmlNodeDumpOutput() public - parser.[ch] nanohttp.c HTMLtree.c HTMLparser.c tree.c: applied and modified slightly Wayne Davison patch adding xmlStrcasecmp and related function, fixing xmlStrncmp(), and associated cleanup - result/HTML/entities.html.sax: updating result Daniel
This commit is contained in:
128
parser.c
128
parser.c
@ -1014,10 +1014,10 @@ xmlStrcmp(const xmlChar *str1, const xmlChar *str2) {
|
||||
if (str1 == NULL) return(-1);
|
||||
if (str2 == NULL) return(1);
|
||||
do {
|
||||
tmp = *str1++ - *str2++;
|
||||
tmp = *str1++ - *str2;
|
||||
if (tmp != 0) return(tmp);
|
||||
} while ((*str1 != 0) && (*str2 != 0)); /* non input consuming */
|
||||
return (*str1 - *str2);
|
||||
} while (*str2++ != 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1036,16 +1036,99 @@ xmlStrncmp(const xmlChar *str1, const xmlChar *str2, int len) {
|
||||
register int tmp;
|
||||
|
||||
if (len <= 0) return(0);
|
||||
if ((str1 == NULL) && (str2 == NULL)) return(0);
|
||||
if (str1 == str2) return(0);
|
||||
if (str1 == NULL) return(-1);
|
||||
if (str2 == NULL) return(1);
|
||||
do {
|
||||
tmp = *str1++ - *str2++;
|
||||
tmp = *str1++ - *str2;
|
||||
if (tmp != 0 || --len == 0) return(tmp);
|
||||
} while (*str2++ != 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static xmlChar casemap[256] = {
|
||||
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
|
||||
0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
|
||||
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
|
||||
0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
|
||||
0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
|
||||
0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
|
||||
0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
|
||||
0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
|
||||
0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
|
||||
0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
|
||||
0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
|
||||
0x78,0x79,0x7A,0x7B,0x5C,0x5D,0x5E,0x5F,
|
||||
0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
|
||||
0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
|
||||
0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
|
||||
0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
|
||||
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
|
||||
0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
|
||||
0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
|
||||
0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
|
||||
0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
|
||||
0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
|
||||
0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
|
||||
0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
|
||||
0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
|
||||
0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
|
||||
0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
|
||||
0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
|
||||
0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
|
||||
0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
|
||||
0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
|
||||
0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
|
||||
};
|
||||
|
||||
/**
|
||||
* xmlStrcasecmp:
|
||||
* @str1: the first xmlChar *
|
||||
* @str2: the second xmlChar *
|
||||
*
|
||||
* a strcasecmp for xmlChar's
|
||||
*
|
||||
* Returns the integer result of the comparison
|
||||
*/
|
||||
|
||||
int
|
||||
xmlStrcasecmp(const xmlChar *str1, const xmlChar *str2) {
|
||||
register int tmp;
|
||||
|
||||
if (str1 == str2) return(0);
|
||||
if (str1 == NULL) return(-1);
|
||||
if (str2 == NULL) return(1);
|
||||
do {
|
||||
tmp = casemap[*str1++] - casemap[*str2];
|
||||
if (tmp != 0) return(tmp);
|
||||
len--;
|
||||
if (len <= 0) return(0);
|
||||
} while ((*str1 != 0) && (*str2 != 0)); /* non input consuming */
|
||||
return (*str1 - *str2);
|
||||
} while (*str2++ != 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* xmlStrncasecmp:
|
||||
* @str1: the first xmlChar *
|
||||
* @str2: the second xmlChar *
|
||||
* @len: the max comparison length
|
||||
*
|
||||
* a strncasecmp for xmlChar's
|
||||
*
|
||||
* Returns the integer result of the comparison
|
||||
*/
|
||||
|
||||
int
|
||||
xmlStrncasecmp(const xmlChar *str1, const xmlChar *str2, int len) {
|
||||
register int tmp;
|
||||
|
||||
if (len <= 0) return(0);
|
||||
if (str1 == str2) return(0);
|
||||
if (str1 == NULL) return(-1);
|
||||
if (str2 == NULL) return(1);
|
||||
do {
|
||||
tmp = casemap[*str1++] - casemap[*str2];
|
||||
if (tmp != 0 || --len == 0) return(tmp);
|
||||
} while (*str2++ != 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1096,6 +1179,33 @@ xmlStrstr(const xmlChar *str, xmlChar *val) {
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* xmlStrcasestr:
|
||||
* @str: the xmlChar * array (haystack)
|
||||
* @val: the xmlChar to search (needle)
|
||||
*
|
||||
* a case-ignoring strstr for xmlChar's
|
||||
*
|
||||
* Returns the xmlChar * for the first occurence or NULL.
|
||||
*/
|
||||
|
||||
const xmlChar *
|
||||
xmlStrcasestr(const xmlChar *str, xmlChar *val) {
|
||||
int n;
|
||||
|
||||
if (str == NULL) return(NULL);
|
||||
if (val == NULL) return(NULL);
|
||||
n = xmlStrlen(val);
|
||||
|
||||
if (n == 0) return(str);
|
||||
while (*str != 0) { /* non input consuming */
|
||||
if (casemap[*str] == casemap[*val])
|
||||
if (!xmlStrncasecmp(str, val, n)) return(str);
|
||||
str++;
|
||||
}
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* xmlStrsub:
|
||||
* @str: the xmlChar * array (haystack)
|
||||
|
Reference in New Issue
Block a user