shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

cleanup: indent in devmapper-event

Browse Source 
Drop header inclusion - this file is already included.
Shorten code.
This commit is contained in:
Zdenek Kabelac 2014-04-29 13:21:15 +02:00
parent b56aef1915
commit cbdf63fdd2
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemons/dmeventd/libdevmapper-event.c
View File

@ -20,7 +20,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/file.h> #include <sys/file.h>
@ -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 *dm_event_handler_create(void)
{ {
struct dm_event_handler *dmevh = NULL; struct dm_event_handler *dmevh;
if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) { if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) {
log_error("Failed to allocate event handler."); 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); dm_free(dmevh->dmeventd_path);
dmevh->dmeventd_path = dm_strdup(dmeventd_path); if (!(dmevh->dmeventd_path = dm_strdup(dmeventd_path)))
if (!dmevh->dmeventd_path)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
@ -93,10 +91,10 @@ int dm_event_handler_set_dso(struct dm_event_handler *dmevh, const char *path)
{ {
if (!path) /* noop */ if (!path) /* noop */
return 0; return 0;
dm_free(dmevh->dso); dm_free(dmevh->dso);
dmevh->dso = dm_strdup(path); if (!(dmevh->dso = dm_strdup(path)))
if (!dmevh->dso)
return -ENOMEM; return -ENOMEM;
return 0; 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); _dm_event_handler_clear_dev_info(dmevh);
dmevh->dev_name = dm_strdup(dev_name); if (!(dmevh->dev_name = dm_strdup(dev_name)))
if (!dmevh->dev_name)
return -ENOMEM; return -ENOMEM;
return 0; 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); _dm_event_handler_clear_dev_info(dmevh);
dmevh->uuid = dm_strdup(uuid); if (!(dmevh->uuid = dm_strdup(uuid)))
if (!dmevh->uuid)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
@ -691,7 +689,6 @@ static int _parse_message(struct dm_event_daemon_message *msg, char **dso_name,
(*dso_name = _fetch_string(&p, ' ')) && (*dso_name = _fetch_string(&p, ' ')) &&
(*uuid = _fetch_string(&p, ' '))) { (*uuid = _fetch_string(&p, ' '))) {
*evmask = atoi(p); *evmask = atoi(p);
dm_free(id); dm_free(id);
return 0; 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 */ ret = -ENXIO; /* dmeventd probably gave us bogus uuid back */
goto fail; goto fail;
} }
dmevh->uuid = dm_strdup(reply_uuid);
if (!dmevh->uuid) { if (!(dmevh->uuid = dm_strdup(reply_uuid))) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;
} }
@ -766,8 +763,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
dm_free(reply_uuid); dm_free(reply_uuid);
reply_uuid = NULL; reply_uuid = NULL;
dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)); if (!(dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)))) {
if (!dmevh->dev_name) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;
} }
@ -852,6 +848,7 @@ int dm_event_get_timeout(const char *device_path, uint32_t *timeout)
if (!device_exists(device_path)) if (!device_exists(device_path))
return -ENODEV; return -ENODEV;
if (!(ret = _do_event(DM_EVENT_CMD_GET_TIMEOUT, &msg, NULL, device_path, if (!(ret = _do_event(DM_EVENT_CMD_GET_TIMEOUT, &msg, NULL, device_path,
0, 0))) { 0, 0))) {
char *p = _skip_string(msg.data, ' '); char *p = _skip_string(msg.data, ' ');