[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 154/173: cookie: fix declaration of 'dup' shadows a
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 154/173: cookie: fix declaration of 'dup' shadows a global declaration |
Date: |
Fri, 24 Feb 2017 14:02:56 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.53.1
in repository gnurl.
commit 588960be2c10fc2ca39fcaae2a34d06c1bd5c2bb
Author: Daniel Stenberg <address@hidden>
AuthorDate: Tue Feb 21 17:44:02 2017 +0100
cookie: fix declaration of 'dup' shadows a global declaration
---
lib/cookie.c | 22 +++++++++++-----------
1 file 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;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 147/173: digest_sspi: Fix nonce-count generation in HTTP digest, (continued)
- [GNUnet-SVN] [gnurl] 147/173: digest_sspi: Fix nonce-count generation in HTTP digest, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 171/173: Revert "tests: use consistent environment variables for setting charset", gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 133/173: curl: fix typo in time condition warning message, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 127/173: URL: only accept "; options" in SMTP/POP3/IMAP URL schemes, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 126/173: cmdline-opts/socks*: Mention --preproxy in --socks* opts, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 168/173: rand: added missing #ifdef HAVE_FCNTL_H around fcntl.h header, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 136/173: tool_urlglob: Allow a glob range with the same start and stop, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 125/173: CURLOPT_SSL_VERIFYPEER.3: also the https proxy version, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 89/173: docs/curl.1: generate from the cmdline-opts script, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 150/173: TODO: CURLOPT_RESOLVE for any port number, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 154/173: cookie: fix declaration of 'dup' shadows a global declaration,
gnunet <=
- [GNUnet-SVN] [gnurl] 162/173: formdata: check for EOF when reading from stdin, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 149/173: RELEASE-NOTES: synced with af30f1152d43dcdb, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 139/173: winbuild: add note on auto-detection of MACHINE in Makefile.vc, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 165/173: THANKS-filter: shachaf, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 138/173: RELEASE-PROCEDURE: update the upcoming release calendar, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 146/173: examples/multi-uv: checksrc compliance, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 166/173: RELEASE-NOTES: synced with 443e5b03a7d441, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 144/173: tests: removed the obsolete name parameter, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 172/173: release: 7.53.1, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 173/173: * Patches to rename libcurl to libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm which can be used to build this with guix prior to installing it. (author: ng0), gnunet, 2017/02/24