From 25888de8d7881514ce4854e39f322ad4240e3d13 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 18 Dec 2015 11:11:15 +0100 Subject: [PATCH] disk plugin: Declare alt_name only when libudev is available. Coverity whines about "output_name = alt_name" being dead code because it sees alt_name as beeing NULL always. CID: 48417 --- src/disk.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/disk.c b/src/disk.c index 8f8f3702..b60fefa0 100644 --- a/src/disk.c +++ b/src/disk.c @@ -681,7 +681,6 @@ static int disk_read (void) { char *disk_name; char *output_name; - char *alt_name; numfields = strsplit (buffer, fields, 32); @@ -841,13 +840,10 @@ static int disk_read (void) output_name = disk_name; #if HAVE_LIBUDEV - alt_name = disk_udev_attr_name (handle_udev, disk_name, - conf_udev_name_attr); -#else - alt_name = NULL; -#endif + char *alt_name = disk_udev_attr_name (handle_udev, disk_name, conf_udev_name_attr); if (alt_name != NULL) output_name = alt_name; +#endif if ((ds->read_bytes != 0) || (ds->write_bytes != 0)) disk_submit (output_name, "disk_octets", @@ -869,8 +865,10 @@ static int disk_read (void) submit_io_time (output_name, io_time, weighted_time); } /* if (is_disk) */ +#if HAVE_LIBUDEV /* release udev-based alternate name, if allocated */ - free(alt_name); + sfree (alt_name); +#endif } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */ #if HAVE_LIBUDEV -- 2.11.0