[libvirt] [PATCH glib] Remove dead cleanup code in object fetch_list helpers

From: "Daniel P. Berrange" <berrange@redhat.com> The fetch_list helper cleanup code iterates over the elements in 'lst' array free'ing each one. This is dead code, however, since the only way to get there is from codepaths which do not populate 'lst' elements. This fixes two coverity DEADCODE reports Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- libvirt-gobject/libvirt-gobject-storage-pool.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 5c8eb16..687a185 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -719,11 +719,7 @@ static gchar ** fetch_list(virConnectPtr vconn, return lst; error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e02adc8..aa27872 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -347,11 +347,7 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, return lst; error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; } -- 1.8.3.1

Hey, On Thu, Aug 15, 2013 at 01:41:44PM +0100, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
The fetch_list helper cleanup code iterates over the elements in 'lst' array free'ing each one. This is dead code, however, since the only way to get there is from codepaths which do not populate 'lst' elements.
ACK. Calling g_free on libvirt-allocated memory was also not very good, so good to have this gone. Christophe

On 08/15/2013 08:41 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
The fetch_list helper cleanup code iterates over the elements in 'lst' array free'ing each one. This is dead code, however, since the only way to get there is from codepaths which do not populate 'lst' elements.
This fixes two coverity DEADCODE reports
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- libvirt-gobject/libvirt-gobject-storage-pool.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-)
This does fix the coverity error, but for both the "gint i;" is now unnecessary resulting in: libvirt-gobject-storage-pool.c:324:10: error: unused variable 'i' [-Werror=unused-variable] gint i; ^ John
diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 5c8eb16..687a185 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -719,11 +719,7 @@ static gchar ** fetch_list(virConnectPtr vconn, return lst;
error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; }
diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e02adc8..aa27872 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -347,11 +347,7 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, return lst;
error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; }

On Mon, Aug 19, 2013 at 07:29:41AM -0400, John Ferlan wrote:
On 08/15/2013 08:41 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
The fetch_list helper cleanup code iterates over the elements in 'lst' array free'ing each one. This is dead code, however, since the only way to get there is from codepaths which do not populate 'lst' elements.
This fixes two coverity DEADCODE reports
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- libvirt-gobject/libvirt-gobject-storage-pool.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-)
This does fix the coverity error, but for both the "gint i;" is now unnecessary resulting in:
libvirt-gobject-storage-pool.c:324:10: error: unused variable 'i' [-Werror=unused-variable] gint i;
Opps, pushed the fix for that. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (3)
-
Christophe Fergeau
-
Daniel P. Berrange
-
John Ferlan