moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-13 13:05:03 -05:00
Code Issues Releases Wiki Activity

tool_formparse.c: rename a couple of vars to avoid declaration shadowing

Browse Source
This commit is contained in:
Yang Tse 2012-04-12 19:28:46 +02:00
parent e19917296f
commit 51114f07f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tool_formparse.c
View File

@ -81,8 +81,8 @@ int formparse(struct Configurable *config,
build a linked list with the info */ build a linked list with the info */
char name[256]; char name[256];
char *contents = NULL; char *contents = NULL;
char major[128]; char type_major[128];
char minor[128]; char type_minor[128];
char *contp; char *contp;
const char *type = NULL; const char *type = NULL;
char *sep; char *sep;
@ -146,7 +146,7 @@ int formparse(struct Configurable *config,
/* verify that this is a fine type specifier */ /* verify that this is a fine type specifier */
if(2 != sscanf(type, "%127[^/]/%127[^;,\n]", if(2 != sscanf(type, "%127[^/]/%127[^;,\n]",
major, minor)) { type_major, type_minor)) {
warnf(config, "Illegally formatted content-type field!\n"); warnf(config, "Illegally formatted content-type field!\n");
Curl_safefree(contents); Curl_safefree(contents);
FreeMultiInfo(&multi_start, &multi_current); FreeMultiInfo(&multi_start, &multi_current);
@ -154,7 +154,7 @@ int formparse(struct Configurable *config,
} }
/* now point beyond the content-type specifier */ /* now point beyond the content-type specifier */
sep = (char *)type + strlen(major)+strlen(minor)+1; sep = (char *)type + strlen(type_major)+strlen(type_minor)+1;
/* there's a semicolon following - we check if it is a filename /* there's a semicolon following - we check if it is a filename
specified and if not we simply assume that it is text that specified and if not we simply assume that it is text that