From 1c651049c5fe2c6b59bf71d3e1221a92bf18f629 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 13 Aug 2010 12:53:08 +0000 Subject: [PATCH] Apply memset-calloc.cocci Change calls to malloc + memset to calloc whenever an automatic conversion can be done. Possible candidates are not treated here, only the ones we can be sure the conversion is safe. SVN revision: 51078 --- legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c | 3 +-- legacy/evas/src/bin/evas_cserve_main.c | 3 +-- legacy/evas/src/lib/engines/common/evas_image_scalecache.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c index b1526499ed..a8ecdc6e63 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c @@ -251,8 +251,7 @@ _ecore_config_ipc_init(const char *pipe_name) ret_srv = NULL; list = NULL; - list = malloc(sizeof(Ecore_Config_Server)); - memset(list, 0, sizeof(Ecore_Config_Server)); + list = calloc(1, sizeof(Ecore_Config_Server)); if ((ret = _ecore_config_ipc_ecore_init(pipe_name, &list->server)) != ECORE_CONFIG_ERR_SUCC) { ERR("_ecore_config_ipc_init: failed to register %s, code %d", diff --git a/legacy/evas/src/bin/evas_cserve_main.c b/legacy/evas/src/bin/evas_cserve_main.c index 4a6745fec3..1f30a95bf9 100644 --- a/legacy/evas/src/bin/evas_cserve_main.c +++ b/legacy/evas/src/bin/evas_cserve_main.c @@ -1309,13 +1309,12 @@ message(void *fdata, Server *s, Client *c, int opcode, int size, unsigned char * len++; } DBG("... malloc msg"); - msg = malloc(len); + msg = calloc(1, len); if (msg) { unsigned char *p; DBG("... init msg"); - memset(msg, 0, len); p = (unsigned char *)msg; msg->active.mem_total = 0; msg->active.count = 0; diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c index 2830ce5195..132d00dd65 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c +++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c @@ -265,8 +265,7 @@ _sci_find(RGBA_Image *im, if (eina_list_count(im->cache.list) > (max_scale_items - 1)) return NULL; - sci = malloc(sizeof(Scaleitem)); - memset(sci, 0, sizeof(Eina_Inlist)); + sci = calloc(1, sizeof(Scaleitem)); sci->parent_im = im; #ifdef EVAS_FRAME_QUEUING RWLKI(sci->lock);