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

Fix a bunch of scan 'dead increments' and cleanup

Browse Source 
* HTMLparser.c c14n.c debugXML.c entities.c nanohttp.c parser.c
  testC14N.c uri.c xmlcatalog.c xmllint.c xmlregexp.c xpath.c:
  fix unused variables, or unneeded increments as well as a couple
  of space issues
* runtest.c: check for NULL before calling unlink()
This commit is contained in:
Daniel Veillard
2009-09-05 14:52:55 +02:00
parent 141ebfa028
commit 13cee4e37b
13 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HTMLparser.c
View File

@ -2560,7 +2560,7 @@ htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) {
NEXT; NEXT;
} }
} }
*out++ = 0; *out = 0;
return(buffer); return(buffer);
} }

2
c14n.c
View File

@ -2226,7 +2226,7 @@ xmlC11NNormalizeString(const xmlChar * input,
} }
cur++; cur++;
} }
*out++ = 0; *out = 0;
return (buffer); return (buffer);
} }
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */

5
debugXML.c
View File

@ -2803,7 +2803,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
{ {
char prompt[500] = "/ > "; char prompt[500] = "/ > ";
char *cmdline = NULL, *cur; char *cmdline = NULL, *cur;
int nbargs;
char command[100]; char command[100];
char arg[400]; char arg[400];
int i; int i;
@ -2855,7 +2854,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
* Parse the command itself * Parse the command itself
*/ */
cur = cmdline; cur = cmdline;
nbargs = 0;
while ((*cur == ' ') || (*cur == '\t')) while ((*cur == ' ') || (*cur == '\t'))
cur++; cur++;
i = 0; i = 0;
@ -2868,7 +2866,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
command[i] = 0; command[i] = 0;
if (i == 0) if (i == 0)
continue; continue;
nbargs++;
/* /*
* Parse the argument * Parse the argument
@ -2882,8 +2879,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
arg[i++] = *cur++; arg[i++] = *cur++;
} }
arg[i] = 0; arg[i] = 0;
if (i != 0)
nbargs++;
/* /*
* start interpreting the command * start interpreting the command

4
entities.c
View File

@ -690,7 +690,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
} }
cur++; cur++;
} }
*out++ = 0; *out = 0;
return(buffer); return(buffer);
} }
@ -772,7 +772,7 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED, const xmlChar *input) {
} }
cur++; cur++;
} }
*out++ = 0; *out = 0;
return(buffer); return(buffer);
} }

2
nanohttp.c
View File

@ -150,6 +150,7 @@ typedef struct xmlNanoHTTPCtxt {
int inlen; /* len of the input buffer */ int inlen; /* len of the input buffer */
int last; /* return code for last operation */ int last; /* return code for last operation */
int returnValue; /* the protocol return value */ int returnValue; /* the protocol return value */
int version; /* the protocol version */
int ContentLength; /* specified content length from HTTP header */ int ContentLength; /* specified content length from HTTP header */
char *contentType; /* the MIME type for the input */ char *contentType; /* the MIME type for the input */
char *location; /* the new URL in case of redirect */ char *location; /* the new URL in case of redirect */
@ -722,6 +723,7 @@ xmlNanoHTTPScanAnswer(xmlNanoHTTPCtxtPtr ctxt, const char *line) {
} }
if ((*cur != 0) && (*cur != ' ') && (*cur != '\t')) return; if ((*cur != 0) && (*cur != ' ') && (*cur != '\t')) return;
ctxt->returnValue = ret; ctxt->returnValue = ret;
ctxt->version = version;
} else if (!xmlStrncasecmp(BAD_CAST line, BAD_CAST"Content-Type:", 13)) { } else if (!xmlStrncasecmp(BAD_CAST line, BAD_CAST"Content-Type:", 13)) {
const xmlChar *charset, *last, *mime; const xmlChar *charset, *last, *mime;
cur += 13; cur += 13;

2
parser.c
View File

@ -2616,7 +2616,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
else else
c = 0; c = 0;
} }
buffer[nbchars++] = 0; buffer[nbchars] = 0;
return(buffer); return(buffer);
mem_error: mem_error:

29
runtest.c
View File

@ -1704,9 +1704,11 @@ saxParseTest(const char *filename, const char *result,
if (compareFiles(temp, result)) { if (compareFiles(temp, result)) {
fprintf(stderr, "Got a difference for %s\n", filename); fprintf(stderr, "Got a difference for %s\n", filename);
ret = 1; ret = 1;
} else }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
/* switch back to structured error handling */ /* switch back to structured error handling */
xmlSetGenericErrorFunc(NULL, NULL); xmlSetGenericErrorFunc(NULL, NULL);
@ -1779,8 +1781,10 @@ oldParseTest(const char *filename, const char *result,
} }
xmlFreeDoc(doc); xmlFreeDoc(doc);
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(res); return(res);
} }
@ -1980,8 +1984,10 @@ noentParseTest(const char *filename, const char *result,
} }
xmlFreeDoc(doc); xmlFreeDoc(doc);
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(res); return(res);
} }
@ -2120,8 +2126,10 @@ streamProcessTest(const char *filename, const char *result, const char *err,
testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n", testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n",
rng); rng);
fclose(t); fclose(t);
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(0); return(0);
} }
} }
@ -2147,8 +2155,10 @@ streamProcessTest(const char *filename, const char *result, const char *err,
if (t != NULL) { if (t != NULL) {
fclose(t); fclose(t);
ret = compareFiles(temp, result); ret = compareFiles(temp, result);
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
if (ret) { if (ret) {
fprintf(stderr, "Result for %s failed\n", filename); fprintf(stderr, "Result for %s failed\n", filename);
return(-1); return(-1);
@ -2357,8 +2367,10 @@ xpathCommonTest(const char *filename, const char *result,
} }
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(ret); return(ret);
} }
@ -2527,8 +2539,10 @@ xmlidDocTest(const char *filename,
} }
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
xmlFreeDoc(xpathDocument); xmlFreeDoc(xpathDocument);
if (err != NULL) { if (err != NULL) {
@ -2614,8 +2628,10 @@ uriCommonTest(const char *filename,
if (f == NULL) { if (f == NULL) {
fprintf(stderr, "failed to open input file %s\n", filename); fprintf(stderr, "failed to open input file %s\n", filename);
fclose(o); fclose(o);
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(-1); return(-1);
} }
@ -2658,8 +2674,10 @@ uriCommonTest(const char *filename,
} }
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(res); return(res);
} }
@ -2933,8 +2951,10 @@ schemasOneTest(const char *sch,
ret = 1; ret = 1;
} }
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
if ((validResult != 0) && (err != NULL)) { if ((validResult != 0) && (err != NULL)) {
if (compareFileMem(err, testErrors, testErrorsSize)) { if (compareFileMem(err, testErrors, testErrorsSize)) {
@ -3106,8 +3126,10 @@ rngOneTest(const char *sch,
ret = 1; ret = 1;
} }
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
if (err != NULL) { if (err != NULL) {
if (compareFileMem(err, testErrors, testErrorsSize)) { if (compareFileMem(err, testErrors, testErrorsSize)) {
@ -3464,7 +3486,7 @@ patternTest(const char *filename,
namespaces[j++] = ns->prefix; namespaces[j++] = ns->prefix;
} }
namespaces[j++] = NULL; namespaces[j++] = NULL;
namespaces[j++] = NULL; namespaces[j] = NULL;
patternc = xmlPatterncompile((const xmlChar *) str, doc->dict, patternc = xmlPatterncompile((const xmlChar *) str, doc->dict,
0, &namespaces[0]); 0, &namespaces[0]);
@ -3512,8 +3534,10 @@ patternTest(const char *filename,
fprintf(stderr, "Result for %s failed\n", filename); fprintf(stderr, "Result for %s failed\n", filename);
ret = 1; ret = 1;
} }
if (temp != NULL) {
unlink(temp); unlink(temp);
free(temp); free(temp);
}
return(ret); return(ret);
} }
#endif /* READER */ #endif /* READER */
@ -3643,7 +3667,6 @@ parse_list(xmlChar *str) {
if((str[0] == '\'') && (str[len - 1] == '\'')) { if((str[0] == '\'') && (str[len - 1] == '\'')) {
str[len - 1] = '\0'; str[len - 1] = '\0';
str++; str++;
len -= 2;
} }
/* /*
* allocate an translation buffer. * allocate an translation buffer.

1
testC14N.c
View File

@ -202,7 +202,6 @@ parse_list(xmlChar *str) {
if((str[0] == '\'') && (str[len - 1] == '\'')) { if((str[0] == '\'') && (str[len - 1] == '\'')) {
str[len - 1] = '\0'; str[len - 1] = '\0';
str++; str++;
len -= 2;
} }
/* /*
* allocate an translation buffer. * allocate an translation buffer.

2
uri.c
View File

@ -1373,7 +1373,7 @@ xmlSaveUri(xmlURIPtr uri) {
} }
ret = temp; ret = temp;
} }
ret[len++] = 0; ret[len] = 0;
return(ret); return(ret);
} }

3
xmlcatalog.c
View File

@ -124,7 +124,6 @@ static void usershell(void) {
free(cmdline); free(cmdline);
continue; continue;
} }
nbargs++;
/* /*
* Parse the argument string * Parse the argument string
@ -138,8 +137,6 @@ static void usershell(void) {
arg[i++] = *cur++; arg[i++] = *cur++;
} }
arg[i] = 0; arg[i] = 0;
if (i != 0)
nbargs++;
/* /*
* Parse the arguments * Parse the arguments

2
xmllint.c
View File

@ -1990,7 +1990,7 @@ static void walkDoc(xmlDocPtr doc) {
namespaces[i++] = ns->prefix; namespaces[i++] = ns->prefix;
} }
namespaces[i++] = NULL; namespaces[i++] = NULL;
namespaces[i++] = NULL; namespaces[i] = NULL;
if (pattern != NULL) { if (pattern != NULL) {
patternc = xmlPatterncompile((const xmlChar *) pattern, doc->dict, patternc = xmlPatterncompile((const xmlChar *) pattern, doc->dict,

4
xmlregexp.c
View File

@ -6923,7 +6923,7 @@ tail:
return(0); return(0);
if (nb >= len) if (nb >= len)
return(-2); return(-2);
list[nb++] = exp->exp_str; list[nb] = exp->exp_str;
return(1); return(1);
case XML_EXP_COUNT: case XML_EXP_COUNT:
exp = exp->exp_left; exp = exp->exp_left;
@ -6978,7 +6978,7 @@ tail:
return(0); return(0);
if (nb >= len) if (nb >= len)
return(-2); return(-2);
list[nb++] = exp->exp_str; list[nb] = exp->exp_str;
return(1); return(1);
case XML_EXP_COUNT: case XML_EXP_COUNT:
exp = exp->exp_left; exp = exp->exp_left;

2
xpath.c
View File

@ -14505,7 +14505,7 @@ xmlXPathTryStreamCompile(xmlXPathContextPtr ctxt, const xmlChar *str) {
namespaces[i++] = ns->prefix; namespaces[i++] = ns->prefix;
} }
namespaces[i++] = NULL; namespaces[i++] = NULL;
namespaces[i++] = NULL; namespaces[i] = NULL;
} }
} }