summaryrefslogtreecommitdiff
path: root/lib/share.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-04-04 15:46:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-04-04 19:27:26 +0200
commit9d1e914a56e8a4030d8917875eaedaddf5cff97c (patch)
tree103f73104c796dd3000b7063623d20a256601d6a /lib/share.c
parentd3408d05935e61a303b5761cc5aa029eb54408f8 (diff)
downloadcurl-9d1e914a56e8a4030d8917875eaedaddf5cff97c.tar.gz
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/share.c')
-rw-r--r--lib/share.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/share.c b/lib/share.c
index e6b8e7a1f..146228551 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, 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
@@ -170,10 +170,8 @@ curl_share_cleanup(CURLSH *sh)
share->hostcache = NULL;
}
-#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
if(share->cookies)
Curl_cookie_cleanup(share->cookies);
-#endif /* CURL_DISABLE_HTTP */
if(share->unlockfunc)
share->unlockfunc(NULL, CURL_LOCK_DATA_SHARE, share->clientdata);