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/elapi_sink.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'common/elapi/elapi_sink.c') diff --git a/common/elapi/elapi_sink.c b/common/elapi/elapi_sink.c index 46ddadd8..0e2712f0 100644 --- a/common/elapi/elapi_sink.c +++ b/common/elapi/elapi_sink.c @@ -432,28 +432,12 @@ int elapi_sink_create(struct elapi_sink_ctx **sink_ctx, TRACE_FLOW_STRING("elapi_sink_create", "Entry point"); /* Allocate context */ - sink_context = (struct elapi_sink_ctx *)malloc(sizeof(struct elapi_sink_ctx)); + sink_context = (struct elapi_sink_ctx *)calloc(1, sizeof(struct elapi_sink_ctx)); if (sink_context == NULL) { TRACE_ERROR_NUMBER("Memory allocation failed. Error", ENOMEM); return ENOMEM; } - /* Initialize the allocatable items so that we can call destroy function - * in case of error. - * FIXME - add initialization here for other elements as they are added. - */ - - sink_context->async_mode = 0; - sink_context->in_queue = NULL; - sink_context->pending = NULL; - sink_context->sink_cfg.provider = NULL; - sink_context->sink_cfg.priv_ctx = NULL; - sink_context->sink_cfg.libhandle = NULL; - sink_context->sink_cfg.ability = NULL; - sink_context->sink_cfg.cpb_cb.init_cb = NULL; - sink_context->sink_cfg.cpb_cb.submit_cb = NULL; - sink_context->sink_cfg.cpb_cb.close_cb = NULL; - /* Read common fields */ error = elapi_read_sink_cfg(&(sink_context->sink_cfg), name, ini_config); -- cgit