From 15891d366d34fa6ea7235ec803ee0c5445a17101 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 20 Jun 2012 10:35:24 +0200 Subject: cleanup: add error message and simplify creation Report error for malloc failure, and use zeroed allocation to initialize handler structure. --- daemons/dmeventd/libdevmapper-event.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 386a4fa4..1f8fbef5 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -59,14 +59,10 @@ struct dm_event_handler *dm_event_handler_create(void) { struct dm_event_handler *dmevh = NULL; - if (!(dmevh = dm_malloc(sizeof(*dmevh)))) + if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) { + log_error("Failed to allocate event handler."); return NULL; - - dmevh->dmeventd_path = NULL; - dmevh->dso = dmevh->dev_name = dmevh->uuid = NULL; - dmevh->major = dmevh->minor = 0; - dmevh->mask = 0; - dmevh->timeout = 0; + } return dmevh; } -- cgit