replaced more malloc(x*y) by calloc(x,y)

6 files changed, 6 insertions, 6 deletions

diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
index 99201f990..dc2f5c112 100644
--- a/camlibs/ptp2/chdk.c
+++ b/camlibs/ptp2/chdk.c
@@ -1206,7 +1206,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
 
 	jpeg_start_compress (&cinfo, TRUE);
 
-	tmprowbuf = malloc (cinfo.image_width * 3);
+	tmprowbuf = calloc (cinfo.image_width , 3);
 	row_ptr[0] = &tmprowbuf[0];
 
 	while (cinfo.next_scanline < cinfo.image_height) {
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 4d1844f4a..ca9fbd6ef 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -1019,7 +1019,7 @@ _put_AUINT8_as_CHAR_ARRAY(CONFIG_PUT_ARGS) {
 	CR (gp_widget_get_value(widget, &value));
 	memset(propval,0,sizeof(PTPPropertyValue));
 	/* add \0 ? */
-	C_MEM (propval->a.v = malloc((strlen(value)+1)*sizeof(PTPPropertyValue)));
+	C_MEM (propval->a.v = calloc((strlen(value)+1),sizeof(PTPPropertyValue)));
 	propval->a.count = strlen(value)+1;
 	for (i=0;i<strlen(value)+1;i++)
 		propval->a.v[i].u8 = value[i];
diff --git a/camlibs/ptp2/fujiptpip.c b/camlibs/ptp2/fujiptpip.c
index 6c1647a56..b22dc18f6 100644
--- a/camlibs/ptp2/fujiptpip.c
+++ b/camlibs/ptp2/fujiptpip.c
@@ -656,7 +656,7 @@ ptp_fujiptpip_init_command_ack (PTPParams* params)
 	memcpy (params->cameraguid, &data[ptpip_cmdack_guid], 16);
 	name = (unsigned short*)&data[ptpip_cmdack_name];
 	for (i=0;name[i];i++) /* EMPTY */;
-	params->cameraname = malloc((i+1)*sizeof(uint16_t));
+	params->cameraname = calloc((i+1),sizeof(uint16_t));
 	for (i=0;name[i];i++)
 		params->cameraname[i] = name[i];
 	free (data);
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 18a667ebc..5d937fe48 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -311,7 +311,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 
 		/* Dup and merge the lists */
 #define DI_MERGE(x) \
-		C_MEM (newdi.x = malloc(sizeof(outerdi->x[0])*(ndi.x##_len + outerdi->x##_len)));\
+		C_MEM (newdi.x = calloc(sizeof(outerdi->x[0]),(ndi.x##_len + outerdi->x##_len)));\
 		for (i = 0; i < outerdi->x##_len ; i++) 					\
 			newdi.x[i] = outerdi->x[i];						\
 		for (i = 0; i < ndi.x##_len ; i++)						\
diff --git a/camlibs/ptp2/olympus-wrap.c b/camlibs/ptp2/olympus-wrap.c
index efcb0ad20..71cada5c4 100644
--- a/camlibs/ptp2/olympus-wrap.c
+++ b/camlibs/ptp2/olympus-wrap.c
@@ -820,7 +820,7 @@ parse_9301_propdesc (PTPParams *params, xmlNodePtr node, PTPDevicePropDesc *dpd)
 				n++;
 			} while (s);
 			dpd->FORM.Enum.NumberOfValues = n;
-			dpd->FORM.Enum.SupportedValue = malloc (n * sizeof(PTPPropertyValue));
+			dpd->FORM.Enum.SupportedValue = calloc (n , sizeof(PTPPropertyValue));
 			s = (char*)xmlNodeGetContent (next);
 			i = 0;
 			do {
diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c
index 1f1d55772..6359a8879 100644
--- a/camlibs/ptp2/ptpip.c
+++ b/camlibs/ptp2/ptpip.c
@@ -514,7 +514,7 @@ ptp_ptpip_init_command_ack (PTPParams* params)
 	memcpy (params->cameraguid, &data[ptpip_cmdack_guid], 16);
 	name = (unsigned short*)&data[ptpip_cmdack_name];
 	for (i=0;name[i];i++) /* EMPTY */;
-	params->cameraname = malloc((i+1)*sizeof(uint16_t));
+	params->cameraname = calloc((i+1),sizeof(uint16_t));
 	for (i=0;name[i];i++)
 		params->cameraname[i] = name[i];
 	free (data);