summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-06-20 10:35:24 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2012-08-23 14:37:38 +0200
commit15891d366d34fa6ea7235ec803ee0c5445a17101 (patch)
tree50cea2a1fb5cce50a0ea9c79b8103c3c0ca682be
parent195fe0307526ffc8307842618a7eeb4a421cacf9 (diff)
downloadlvm2-15891d366d34fa6ea7235ec803ee0c5445a17101.tar.gz
lvm2-15891d366d34fa6ea7235ec803ee0c5445a17101.tar.xz
lvm2-15891d366d34fa6ea7235ec803ee0c5445a17101.zip
cleanup: add error message and simplify creation
Report error for malloc failure, and use zeroed allocation to initialize handler structure.
-rw-r--r--daemons/dmeventd/libdevmapper-event.c10
1 files 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;
}