From c18ccff44688a03fbfafa069ed1860935992dc61 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 3 Feb 2009 13:08:07 +0000 Subject: [PATCH] cleanup: remove useless if-before-VIR_FREE * Makefile.cfg (useless_free_options): Also check for VIR_FREE. * src/iptables.c (iptRulesFree): Remove useless if-before-VIR_FREE. * src/remote_internal.c (remoteAuthSASL): Likewise. * src/test.c (testOpenFromFile): Likewise. --- ChangeLog | 8 ++++++++ Makefile.cfg | 1 + src/iptables.c | 9 +++------ src/remote_internal.c | 4 +--- src/test.c | 11 ++++------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c0fedbfde..dc443209c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue, 3 Feb 2009 14:06:05 +0100 Jim Meyering + + cleanup: remove useless if-before-VIR_FREE + * Makefile.cfg (useless_free_options): Also check for VIR_FREE. + * src/iptables.c (iptRulesFree): Remove useless if-before-VIR_FREE. + * src/remote_internal.c (remoteAuthSASL): Likewise. + * src/test.c (testOpenFromFile): Likewise. + Mon, 2 Feb 2009 21:33:57 +0100 Jim Meyering tests: diagnose more open failures diff --git a/Makefile.cfg b/Makefile.cfg index 44d3898c2a..d9bccd203f 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -59,6 +59,7 @@ local-checks-to-skip = \ useless_free_options = \ --name=sexpr_free \ + --name=VIR_FREE \ --name=xmlFree \ --name=xmlXPathFreeContext \ --name=xmlXPathFreeObject diff --git a/src/iptables.c b/src/iptables.c index ad7fddf1bf..c850b9ecb7 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008 Red Hat, Inc. + * Copyright (C) 2007-2009 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -325,11 +325,8 @@ iptRulesFree(iptRules *rules) { int i; - if (rules->table) - VIR_FREE(rules->table); - - if (rules->chain) - VIR_FREE(rules->chain); + VIR_FREE(rules->table); + VIR_FREE(rules->chain); if (rules->rules) { for (i = 0; i < rules->nrules; i++) diff --git a/src/remote_internal.c b/src/remote_internal.c index b6e963af85..a14822ae48 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -5388,9 +5388,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, goto cleanup; } - if (serverin) { - VIR_FREE(serverin); - } + VIR_FREE(serverin); DEBUG("Client step result %d. Data %d bytes %p", err, clientoutlen, clientout); /* Previous server call showed completion & we're now locally complete too */ diff --git a/src/test.c b/src/test.c index 59b9370f55..0e0ec7c400 100644 --- a/src/test.c +++ b/src/test.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2009 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -509,8 +509,7 @@ static int testOpenFromFile(virConnectPtr conn, dom->persistent = 1; virDomainObjUnlock(dom); } - if (domains != NULL) - VIR_FREE(domains); + VIR_FREE(domains); ret = virXPathNodeSet(conn, "/node/network", ctxt, &networks); if (ret < 0) { @@ -544,8 +543,7 @@ static int testOpenFromFile(virConnectPtr conn, net->persistent = 1; virNetworkObjUnlock(net); } - if (networks != NULL) - VIR_FREE(networks); + VIR_FREE(networks); /* Parse Storage Pool list */ ret = virXPathNodeSet(conn, "/node/pool", ctxt, &pools); @@ -599,8 +597,7 @@ static int testOpenFromFile(virConnectPtr conn, pool->active = 1; virStoragePoolObjUnlock(pool); } - if (pools != NULL) - VIR_FREE(pools); + VIR_FREE(pools); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); -- GitLab