aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-12-20 22:51:57 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-12-20 22:51:57 +0000
commit2a868173497c0b7ae251537903ee9941dddebeba (patch)
tree26f28994eebcb73f17bbe174ffdc5ff56aa4cadd /lib
parent5be7d88b34873ef6e16ace91ba6d89f4b3203e61 (diff)
malloc+memset => calloc
Diffstat (limited to 'lib')
-rw-r--r--lib/formdata.c3
-rw-r--r--lib/share.c8
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/formdata.c b/lib/formdata.c
index 08ccf4db3..10f2caeac 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -222,9 +222,8 @@ static FormInfo * AddFormInfo(char *value,
FormInfo *parent_form_info)
{
FormInfo *form_info;
- form_info = malloc(sizeof(FormInfo));
+ form_info = calloc(sizeof(FormInfo), 1);
if(form_info) {
- memset(form_info, 0, sizeof(FormInfo));
if(value)
form_info->value = value;
if(contenttype)
diff --git a/lib/share.c b/lib/share.c
index 838a15916..382e4b3d0 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, 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
@@ -36,11 +36,9 @@
CURLSH *
curl_share_init(void)
{
- struct Curl_share *share = malloc(sizeof(struct Curl_share));
- if(share) {
- memset (share, 0, sizeof(struct Curl_share));
+ struct Curl_share *share = calloc(sizeof(struct Curl_share), 1);
+ if(share)
share->specifier |= (1<<CURL_LOCK_DATA_SHARE);
- }
return share;
}