diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-04-12 19:28:46 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-04-12 19:28:46 +0200 |
| commit | 51114f07f177a2b59a5060c9699daf925f2269a6 (patch) | |
| tree | f57334dd7326c608bd531c73479919e888a9b42c /src/tool_formparse.c | |
| parent | e19917296f360159975214bcabbaf1713956c356 (diff) | |
| download | curl-51114f07f177a2b59a5060c9699daf925f2269a6.tar.gz | |
tool_formparse.c: rename a couple of vars to avoid declaration shadowing
Diffstat (limited to 'src/tool_formparse.c')
| -rw-r--r-- | src/tool_formparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tool_formparse.c b/src/tool_formparse.c index e83f7eda1..12b1a9d46 100644 --- a/src/tool_formparse.c +++ b/src/tool_formparse.c @@ -81,8 +81,8 @@ int formparse(struct Configurable *config, build a linked list with the info */ char name[256]; char *contents = NULL; - char major[128]; - char minor[128]; + char type_major[128]; + char type_minor[128]; char *contp; const char *type = NULL; char *sep; @@ -146,7 +146,7 @@ int formparse(struct Configurable *config, /* verify that this is a fine type specifier */ if(2 != sscanf(type, "%127[^/]/%127[^;,\n]", - major, minor)) { + type_major, type_minor)) { warnf(config, "Illegally formatted content-type field!\n"); Curl_safefree(contents); FreeMultiInfo(&multi_start, &multi_current); @@ -154,7 +154,7 @@ int formparse(struct Configurable *config, } /* 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 specified and if not we simply assume that it is text that |