diff options
author | Daniel Stenberg <daniel@haxx.se> | 2015-03-16 15:01:15 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2015-03-16 15:01:15 +0100 |
commit | 0f4a03cbb6fdb84d05cb6aafe50444edad4f4119 (patch) | |
tree | 89472eece4173a97ac3b80aba5e35ed70cdd7845 /lib/http_negotiate.c | |
parent | 9e661601feba03d1158ac466a457d5a6ce7f3f11 (diff) | |
download | curl-0f4a03cbb6fdb84d05cb6aafe50444edad4f4119.tar.gz |
free: instead of Curl_safefree()
Since we just started make use of free(NULL) in order to simplify code,
this change takes it a step further and:
- converts lots of Curl_safefree() calls to good old free()
- makes Curl_safefree() not check the pointer before free()
The (new) rule of thumb is: if you really want a function call that
frees a pointer and then assigns it to NULL, then use Curl_safefree().
But we will prefer just using free() from now on.
Diffstat (limited to 'lib/http_negotiate.c')
-rw-r--r-- | lib/http_negotiate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index 89c01f768..1c840fe03 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -78,12 +78,12 @@ CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy, if(GSS_ERROR(major_status)) { Curl_gss_log_error(data, minor_status, "gss_import_name() failed: "); - Curl_safefree(spn); + free(spn); return CURLE_OUT_OF_MEMORY; } - Curl_safefree(spn); + free(spn); } header += strlen("Negotiate"); @@ -179,7 +179,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy) conn->allocptr.userpwd = userp; } - Curl_safefree(encoded); + free(encoded); return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK; } |