From bd6fd964f9ebf8c0bf4fd3cd6413eb85b3ab16a9 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 27 Oct 2014 16:38:06 +0000 Subject: [PATCH] Remove useless 'if (...)' before free() The 'free()' function accepts NULL, so you should not check for NULL before calling it. --- src/remote-viewer.c | 4 +--- src/virt-viewer.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/remote-viewer.c b/src/remote-viewer.c index 112ef8b..7030c3e 100644 --- a/src/remote-viewer.c +++ b/src/remote-viewer.c @@ -1148,9 +1148,7 @@ choose_vm(char **vm_name, OvirtCollection *vms_collection, GError **error) OvirtVm *vm; g_return_val_if_fail(vm_name != NULL, NULL); - if (*vm_name != NULL) { - free(*vm_name); - } + free(*vm_name); model = gtk_list_store_new(1, G_TYPE_STRING); diff --git a/src/virt-viewer.c b/src/virt-viewer.c index cbedc9f..a3551d4 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -555,9 +555,7 @@ choose_vm(char **vm_name, virConnectPtr conn, GError **error) unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING; g_return_val_if_fail(vm_name != NULL, NULL); - if (*vm_name != NULL) { - free(*vm_name); - } + free(*vm_name); model = gtk_list_store_new(1, G_TYPE_STRING);