From cbdf63fdd21216af78077ae2d02ac307a3deec0a Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 29 Apr 2014 13:21:15 +0200 Subject: [PATCH] cleanup: indent in devmapper-event Drop header inclusion - this file is already included. Shorten code. --- daemons/dmeventd/libdevmapper-event.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 57185b9ca..6b7338fba 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -57,7 +56,7 @@ static void _dm_event_handler_clear_dev_info(struct dm_event_handler *dmevh) struct dm_event_handler *dm_event_handler_create(void) { - struct dm_event_handler *dmevh = NULL; + struct dm_event_handler *dmevh; if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) { log_error("Failed to allocate event handler."); @@ -82,8 +81,7 @@ int dm_event_handler_set_dmeventd_path(struct dm_event_handler *dmevh, const cha dm_free(dmevh->dmeventd_path); - dmevh->dmeventd_path = dm_strdup(dmeventd_path); - if (!dmevh->dmeventd_path) + if (!(dmevh->dmeventd_path = dm_strdup(dmeventd_path))) return -ENOMEM; return 0; @@ -93,10 +91,10 @@ int dm_event_handler_set_dso(struct dm_event_handler *dmevh, const char *path) { if (!path) /* noop */ return 0; + dm_free(dmevh->dso); - dmevh->dso = dm_strdup(path); - if (!dmevh->dso) + if (!(dmevh->dso = dm_strdup(path))) return -ENOMEM; return 0; @@ -109,9 +107,9 @@ int dm_event_handler_set_dev_name(struct dm_event_handler *dmevh, const char *de _dm_event_handler_clear_dev_info(dmevh); - dmevh->dev_name = dm_strdup(dev_name); - if (!dmevh->dev_name) + if (!(dmevh->dev_name = dm_strdup(dev_name))) return -ENOMEM; + return 0; } @@ -122,9 +120,9 @@ int dm_event_handler_set_uuid(struct dm_event_handler *dmevh, const char *uuid) _dm_event_handler_clear_dev_info(dmevh); - dmevh->uuid = dm_strdup(uuid); - if (!dmevh->uuid) + if (!(dmevh->uuid = dm_strdup(uuid))) return -ENOMEM; + return 0; } @@ -691,7 +689,6 @@ static int _parse_message(struct dm_event_daemon_message *msg, char **dso_name, (*dso_name = _fetch_string(&p, ' ')) && (*uuid = _fetch_string(&p, ' '))) { *evmask = atoi(p); - dm_free(id); return 0; } @@ -746,8 +743,8 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) ret = -ENXIO; /* dmeventd probably gave us bogus uuid back */ goto fail; } - dmevh->uuid = dm_strdup(reply_uuid); - if (!dmevh->uuid) { + + if (!(dmevh->uuid = dm_strdup(reply_uuid))) { ret = -ENOMEM; goto fail; } @@ -766,8 +763,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) dm_free(reply_uuid); reply_uuid = NULL; - dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)); - if (!dmevh->dev_name) { + if (!(dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)))) { ret = -ENOMEM; goto fail; } @@ -852,6 +848,7 @@ int dm_event_get_timeout(const char *device_path, uint32_t *timeout) if (!device_exists(device_path)) return -ENODEV; + if (!(ret = _do_event(DM_EVENT_CMD_GET_TIMEOUT, &msg, NULL, device_path, 0, 0))) { char *p = _skip_string(msg.data, ' ');