summaryrefslogtreecommitdiffstats
path: root/libblkid/src/devname.c
diff options
context:
space:
mode:
authorKarel Zak2011-09-12 15:22:51 +0200
committerKarel Zak2011-09-12 15:22:51 +0200
commitb29a641219f647d389ae782f3d7a0cd8b1051bed (patch)
tree82a0af60b6e0949823df9486b2662000a076147b /libblkid/src/devname.c
parentbuild-sys: don't use full paths for smatch (diff)
downloadkernel-qcow2-util-linux-b29a641219f647d389ae782f3d7a0cd8b1051bed.tar.gz
kernel-qcow2-util-linux-b29a641219f647d389ae782f3d7a0cd8b1051bed.tar.xz
kernel-qcow2-util-linux-b29a641219f647d389ae782f3d7a0cd8b1051bed.zip
libblkid: remove unnecessary position check from list_for_each_safe loops
The position pointer is dereferenced before the check in the for() in the list_for_each_safe macro. Note that struct list_head should not contain NULL pointers. See INIT_LIST_HEAD() macro. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/devname.c')
-rw-r--r--libblkid/src/devname.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index e1fc2c849..f824a1795 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -91,10 +91,7 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags)
* it.
*/
list_for_each_safe(p, pnext, &cache->bic_devs) {
- blkid_dev dev2;
- if (!p)
- break;
- dev2 = list_entry(p, struct blkid_struct_dev, bid_devs);
+ blkid_dev dev2 = list_entry(p, struct blkid_struct_dev, bid_devs);
if (dev2->bid_flags & BLKID_BID_FL_VERIFIED)
continue;
if (!dev->bid_type || !dev2->bid_type ||