diff options
author | Daniel Stenberg <daniel@haxx.se> | 2017-04-20 15:10:04 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2017-04-22 11:25:27 +0200 |
commit | cbae73e1dd95946597ea74ccb580c30f78e3fa73 (patch) | |
tree | 56697b9325403031bb2fcfc6a723719b9819b0be /lib/fileinfo.c | |
parent | cbb59ed9ce9555e0dc0b485247fe86f0e45006b3 (diff) | |
download | curl-cbae73e1dd95946597ea74ccb580c30f78e3fa73.tar.gz |
llist: no longer uses malloc
The 'list element' struct now has to be within the data that is being
added to the list. Removes 16.6% (tiny) mallocs from a simple HTTP
transfer. (96 => 80)
Also removed return codes since the llist functions can't fail now.
Test 1300 updated accordingly.
Closes #1435
Diffstat (limited to 'lib/fileinfo.c')
-rw-r--r-- | lib/fileinfo.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/fileinfo.c b/lib/fileinfo.c index 144c65b1d..387298847 100644 --- a/lib/fileinfo.c +++ b/lib/fileinfo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 2017, 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 @@ -28,23 +28,19 @@ /* The last #include file should be: */ #include "memdebug.h" -struct curl_fileinfo *Curl_fileinfo_alloc(void) +struct fileinfo *Curl_fileinfo_alloc(void) { - struct curl_fileinfo *tmp = malloc(sizeof(struct curl_fileinfo)); - if(!tmp) - return NULL; - memset(tmp, 0, sizeof(struct curl_fileinfo)); - return tmp; + return calloc(1, sizeof(struct fileinfo)); } void Curl_fileinfo_dtor(void *user, void *element) { - struct curl_fileinfo *finfo = element; + struct fileinfo *finfo = element; (void) user; if(!finfo) return; - Curl_safefree(finfo->b_data); + Curl_safefree(finfo->info.b_data); free(finfo); } |