diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 15:46:42 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 19:27:26 +0200 |
| commit | 9d1e914a56e8a4030d8917875eaedaddf5cff97c (patch) | |
| tree | 103f73104c796dd3000b7063623d20a256601d6a /lib/easy.c | |
| parent | d3408d05935e61a303b5761cc5aa029eb54408f8 (diff) | |
disable cookies: remove ifdefs, move code
1 - make sure to #define macros for cookie functions in the cookie
header when cookies are disabled to avoid having to use #ifdefs in code
using those functions.
2 - move cookie-specific code to cookie.c and use the functio
conditionally as mentioned in (1).
net result: 6 #if lines removed, and 9 lines of code less
Diffstat (limited to 'lib/easy.c')
| -rw-r--r-- | lib/easy.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/easy.c b/lib/easy.c index 6f553475b..7015eced2 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -654,7 +654,6 @@ CURL *curl_easy_duphandle(CURL *incurl) outcurl->progress.flags = data->progress.flags; outcurl->progress.callback = data->progress.callback; -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) if(data->cookies) { /* If cookies are enabled in the parent handle, we enable them in the clone as well! */ @@ -665,18 +664,14 @@ CURL *curl_easy_duphandle(CURL *incurl) if(!outcurl->cookies) goto fail; } -#endif /* CURL_DISABLE_HTTP */ /* duplicate all values in 'change' */ - -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) if(data->change.cookielist) { outcurl->change.cookielist = Curl_slist_duplicate(data->change.cookielist); if(!outcurl->change.cookielist) goto fail; } -#endif /* CURL_DISABLE_HTTP */ if(data->change.url) { outcurl->change.url = strdup(data->change.url); @@ -724,10 +719,8 @@ CURL *curl_easy_duphandle(CURL *incurl) Curl_rm_connc(outcurl->state.connc); if(outcurl->state.headerbuff) free(outcurl->state.headerbuff); -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) if(outcurl->change.cookielist) curl_slist_free_all(outcurl->change.cookielist); -#endif if(outcurl->change.url) free(outcurl->change.url); if(outcurl->change.referer) |