diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-01-06 10:45:41 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-01-06 10:45:41 +0000 |
| commit | 0a9b444a60eb580ac571e71fc5343cb20364e4de (patch) | |
| tree | ec8eb5bbc6f82f60e9dbfd739cae819204dfe475 /daemons/dmeventd | |
| parent | 4b1232984bcf2bb6ca69760d0095a9e152127a9a (diff) | |
| download | lvm2-0a9b444a60eb580ac571e71fc5343cb20364e4de.tar.gz lvm2-0a9b444a60eb580ac571e71fc5343cb20364e4de.tar.xz lvm2-0a9b444a60eb580ac571e71fc5343cb20364e4de.zip | |
Remove dead assignment of 'ret' value
Variable 'ret' assigned from _do_event() was actually not used and replaced with next
assignment without any read of the returned value.
Code is reformated - so the error path is put in the if() branch and normal
code is put after the 'if' together with FIXME comment.
FIXME lowprio: logging needs to be fixed in this code,
- multiple log_errors are printed, stacks are missing...
Diffstat (limited to 'daemons/dmeventd')
| -rw-r--r-- | daemons/dmeventd/libdevmapper-event.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index fc80d865..8af2e3a7 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -715,17 +715,18 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next) uuid = dm_task_get_uuid(dmt); - if (!(ret = _do_event(next ? DM_EVENT_CMD_GET_NEXT_REGISTERED_DEVICE : - DM_EVENT_CMD_GET_REGISTERED_DEVICE, dmevh->dmeventd_path, - &msg, dmevh->dso, uuid, dmevh->mask, 0))) { - /* FIXME this will probably horribly break if we get - ill-formatted reply */ - ret = _parse_message(&msg, &reply_dso, &reply_uuid, &reply_mask); - } else { + if (_do_event(next ? DM_EVENT_CMD_GET_NEXT_REGISTERED_DEVICE : + DM_EVENT_CMD_GET_REGISTERED_DEVICE, dmevh->dmeventd_path, + &msg, dmevh->dso, uuid, dmevh->mask, 0)) { ret = -ENOENT; + stack; goto fail; } + /* FIXME this will probably horribly break if we get + ill-formatted reply */ + ret = _parse_message(&msg, &reply_dso, &reply_uuid, &reply_mask); + dm_task_destroy(dmt); dmt = NULL; |