From 7b9103a622683575192f35d1865794c8680f99c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 17 Jul 2019 11:30:04 +0200 Subject: [PATCH] sd-device: voidify and simplify calls to ordered_hashmap_iterate() Coverity CID#1402356 and CID#1402335. --- src/libsystemd/sd-device/sd-device.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 617d6de667f..c4a7f2f3d34 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1540,7 +1540,6 @@ int device_properties_prepare(sd_device *device) { _public_ const char *sd_device_get_property_first(sd_device *device, const char **_value) { const char *key; - const char *value; int r; assert_return(device, NULL); @@ -1552,16 +1551,12 @@ _public_ const char *sd_device_get_property_first(sd_device *device, const char device->properties_iterator_generation = device->properties_generation; device->properties_iterator = ITERATOR_FIRST; - ordered_hashmap_iterate(device->properties, &device->properties_iterator, (void**)&value, (const void**)&key); - - if (_value) - *_value = value; + (void) ordered_hashmap_iterate(device->properties, &device->properties_iterator, (void**)_value, (const void**)&key); return key; } _public_ const char *sd_device_get_property_next(sd_device *device, const char **_value) { const char *key; - const char *value; int r; assert_return(device, NULL); @@ -1573,10 +1568,7 @@ _public_ const char *sd_device_get_property_next(sd_device *device, const char * if (device->properties_iterator_generation != device->properties_generation) return NULL; - ordered_hashmap_iterate(device->properties, &device->properties_iterator, (void**)&value, (const void**)&key); - - if (_value) - *_value = value; + (void) ordered_hashmap_iterate(device->properties, &device->properties_iterator, (void**)_value, (const void**)&key); return key; } -- 2.47.3