summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-02-21 17:44:02 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-02-21 17:44:02 +0100
commit588960be2c10fc2ca39fcaae2a34d06c1bd5c2bb (patch)
tree16240dfbc1a8e0ef34e86962a8de75281ba37585
parentca6ea6d9be5102a2246dff6e17b3ee9ad4ec64d0 (diff)
downloadcurl-588960be2c10fc2ca39fcaae2a34d06c1bd5c2bb.tar.gz
cookie: fix declaration of 'dup' shadows a global declaration
-rw-r--r--lib/cookie.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/cookie.c b/lib/cookie.c
index 8a4b844fc..946284331 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -1064,16 +1064,16 @@ static int cookie_sort(const void *p1, const void *p2)
#define CLONE(field) \
do { \
if(src->field) { \
- dup->field = strdup(src->field); \
- if(!dup->field) \
+ d->field = strdup(src->field); \
+ if(!d->field) \
goto fail; \
} \
} while(0)
static struct Cookie *dup_cookie(struct Cookie *src)
{
- struct Cookie *dup = calloc(sizeof(struct Cookie), 1);
- if(dup) {
+ struct Cookie *d = calloc(sizeof(struct Cookie), 1);
+ if(d) {
CLONE(expirestr);
CLONE(domain);
CLONE(path);
@@ -1082,16 +1082,16 @@ static struct Cookie *dup_cookie(struct Cookie *src)
CLONE(value);
CLONE(maxage);
CLONE(version);
- dup->expires = src->expires;
- dup->tailmatch = src->tailmatch;
- dup->secure = src->secure;
- dup->livecookie = src->livecookie;
- dup->httponly = src->httponly;
+ d->expires = src->expires;
+ d->tailmatch = src->tailmatch;
+ d->secure = src->secure;
+ d->livecookie = src->livecookie;
+ d->httponly = src->httponly;
}
- return dup;
+ return d;
fail:
- freecookie(dup);
+ freecookie(d);
return NULL;
}