From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30686 invoked by alias); 6 Jan 2011 10:45:42 -0000 Received: (qmail 30669 invoked by uid 9737); 6 Jan 2011 10:45:41 -0000 Date: Thu, 06 Jan 2011 10:45:00 -0000 Message-ID: <20110106104541.30667.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/dmeventd libdevmapper-event.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-01/txt/msg00025.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-01-06 10:45:41 Modified files: daemons/dmeventd: libdevmapper-event.c Log message: 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... Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/libdevmapper-event.c.diff?cvsroot=lvm2&r1=1.38&r2=1.39 --- LVM2/daemons/dmeventd/libdevmapper-event.c 2011/01/06 09:45:05 1.38 +++ LVM2/daemons/dmeventd/libdevmapper-event.c 2011/01/06 10:45:41 1.39 @@ -715,17 +715,18 @@ 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;