From 8a01230d3b5c048658e2157c6ff68b3680aafd26 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 17 Sep 2009 16:04:45 +0200 Subject: ELAPI: Ticket 161: Initialize structures with calloc instead of enumerating members --- common/elapi/providers/file/file_fmt_csv.c | 2 +- common/elapi/providers/file/file_provider.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'common/elapi/providers') diff --git a/common/elapi/providers/file/file_fmt_csv.c b/common/elapi/providers/file/file_fmt_csv.c index a8111133..e55d0b1c 100644 --- a/common/elapi/providers/file/file_fmt_csv.c +++ b/common/elapi/providers/file/file_fmt_csv.c @@ -275,7 +275,7 @@ int file_get_csv_cfg(void **storage, TRACE_FLOW_STRING("file_get_csv_cfg", "Entry"); /* Allocate memory for configuration */ - cfg = (struct file_csv_cfg *)malloc(sizeof(struct file_csv_cfg)); + cfg = (struct file_csv_cfg *) calloc(1, sizeof(struct file_csv_cfg)); if (cfg == NULL) { TRACE_ERROR_NUMBER("Failed to allocate storage for CSV configuration", ENOMEM); return ENOMEM; diff --git a/common/elapi/providers/file/file_provider.c b/common/elapi/providers/file/file_provider.c index 09d6261e..652e6468 100644 --- a/common/elapi/providers/file/file_provider.c +++ b/common/elapi/providers/file/file_provider.c @@ -550,16 +550,12 @@ static int file_create_ctx(struct file_prvdr_ctx **file_ctx, TRACE_FLOW_STRING("file_create_ctx", "Entry point"); - ctx = (struct file_prvdr_ctx *)malloc(sizeof(struct file_prvdr_ctx)); + ctx = (struct file_prvdr_ctx *)calloc(1, sizeof(struct file_prvdr_ctx)); if (ctx == NULL) { TRACE_ERROR_NUMBER("Failed to allocate context", ENOMEM); return ENOMEM; } - - /* Init allocatable items */ - ctx->config.filename = NULL; - ctx->config.main_fmt_cfg = NULL; - ctx->config.lo_fmt_cfg = NULL; + /* Init items */ ctx->outfile = -1; /* Read configuration data */ -- cgit