COMP: Remove warnings about shadow variables

4 files changed, 16 insertions, 16 deletions

diff --git a/Source/CTest/Curl/file.c b/Source/CTest/Curl/file.c
index 1fe6e5d..cd4366c 100644
--- a/Source/CTest/Curl/file.c
+++ b/Source/CTest/Curl/file.c
@@ -320,12 +320,12 @@ CURLcode Curl_file(struct connectdata *conn)
 #ifdef HAVE_STRFTIME
     if(fstated) {
       struct tm *tm;
-      time_t clock = (time_t)statbuf.st_mtime;
+      time_t cuClock = (time_t)statbuf.st_mtime;
 #ifdef HAVE_GMTIME_R
       struct tm buffer;
-      tm = (struct tm *)gmtime_r(&clock, &buffer);
+      tm = (struct tm *)gmtime_r(&cuClock, &buffer);
 #else
-      tm = gmtime(&clock);
+      tm = gmtime(&cuClock);
 #endif
       /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
       strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n",
diff --git a/Source/CTest/Curl/ftp.c b/Source/CTest/Curl/ftp.c
index 60881b0..2501412 100644
--- a/Source/CTest/Curl/ftp.c
+++ b/Source/CTest/Curl/ftp.c
@@ -2203,12 +2203,12 @@ CURLcode ftp_perform(struct connectdata *conn,
 #ifdef HAVE_STRFTIME
     if(data->set.get_filetime && (data->info.filetime>=0) ) {
       struct tm *tm;
-      time_t clock = (time_t)data->info.filetime;
+      time_t cuClock = (time_t)data->info.filetime;
 #ifdef HAVE_GMTIME_R
       struct tm buffer;
-      tm = (struct tm *)gmtime_r(&clock, &buffer);
+      tm = (struct tm *)gmtime_r(&cuClock, &buffer);
 #else
-      tm = gmtime(&clock);
+      tm = gmtime(&cuClock);
 #endif
       /* format: "Tue, 15 Nov 1994 12:45:26" */
       strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n",
diff --git a/Source/CTest/Curl/http.c b/Source/CTest/Curl/http.c
index ef01d2f..7cf543b 100644
--- a/Source/CTest/Curl/http.c
+++ b/Source/CTest/Curl/http.c
@@ -1410,8 +1410,8 @@ CURLcode Curl_http(struct connectdata *conn)
        uses the encoded host name! */
     if(conn->host.dispname != conn->host.name) {
       char *url = data->change.url;
-      char *ptr = strstr(url, conn->host.dispname);
-      if(ptr) {
+      char *iPtr = strstr(url, conn->host.dispname);
+      if(iPtr) {
         /* This is where the display name starts in the URL, now replace this
            part with the encoded name. TODO: This method of replacing the host
            name is rather crude as I believe there's a slight risk that the
@@ -1426,13 +1426,13 @@ CURLcode Curl_http(struct connectdata *conn)
         newurl = malloc(urllen + newlen - currlen + 1);
         if(newurl) {
           /* copy the part before the host name */
-          memcpy(newurl, url, ptr - url);
+          memcpy(newurl, url, iPtr - url);
           /* append the new host name instead of the old */
-          memcpy(newurl + (ptr - url), conn->host.name, newlen);
+          memcpy(newurl + (iPtr - url), conn->host.name, newlen);
           /* append the piece after the host name */
-          memcpy(newurl + newlen + (ptr - url),
-                 ptr + currlen, /* copy the trailing zero byte too */
-                 urllen - (ptr-url) - currlen + 1);
+          memcpy(newurl + newlen + (iPtr - url),
+                 iPtr + currlen, /* copy the trailing zero byte too */
+                 urllen - (iPtr-url) - currlen + 1);
           if(data->change.url_alloc)
             free(data->change.url);
           data->change.url = newurl;
diff --git a/Source/CTest/Curl/sendf.c b/Source/CTest/Curl/sendf.c
index 89c2665..fae2ff3 100644
--- a/Source/CTest/Curl/sendf.c
+++ b/Source/CTest/Curl/sendf.c
@@ -88,10 +88,10 @@ struct curl_slist *curl_slist_append(struct curl_slist *list,
 
   new_item = (struct curl_slist *) malloc(sizeof(struct curl_slist));
   if (new_item) {
-    char *dup = strdup(data);
-    if(dup) {
+    char *cuDup = strdup(data);
+    if(cuDup) {
       new_item->next = NULL;
-      new_item->data = dup;
+      new_item->data = cuDup;
     }
     else {
       free(new_item);