From 51114f07f177a2b59a5060c9699daf925f2269a6 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 12 Apr 2012 19:28:46 +0200 Subject: [PATCH] tool_formparse.c: rename a couple of vars to avoid declaration shadowing --- src/tool_formparse.c | 8 ++++---- 1 file 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