diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-01-31 15:22:46 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-02-06 12:42:18 +0000 |
| commit | 48c50437fa29f8baccf8acb550f2235fd12643df (patch) | |
| tree | 36ffd02489051f4c5c86267d5f7c2fc595a8017b | |
| parent | df1ae9f6865414d74340bdd1d85ae7d30307e870 (diff) | |
| download | virt-viewer-48c50437fa29f8baccf8acb550f2235fd12643df.tar.gz virt-viewer-48c50437fa29f8baccf8acb550f2235fd12643df.tar.xz virt-viewer-48c50437fa29f8baccf8acb550f2235fd12643df.zip | |
Remove useless if() before free()
| -rw-r--r-- | plugin/npshell.c | 4 | ||||
| -rw-r--r-- | src/virt-viewer.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/plugin/npshell.c b/plugin/npshell.c index d85739c..bb43da3 100644 --- a/plugin/npshell.c +++ b/plugin/npshell.c @@ -235,8 +235,8 @@ NPP_Destroy(NPP instance, NPSavedData** save G_GNUC_UNUSED) if (This != NULL) { (void) VirtViewerDestroyWindow (instance); - if (This->uri) free (This->uri); - if (This->name) free (This->name); + free (This->uri); + free (This->name); NPN_MemFree(instance->pdata); instance->pdata = NULL; } diff --git a/src/virt-viewer.c b/src/virt-viewer.c index 31c4dd9..e1ead3f 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -275,14 +275,10 @@ virt_viewer_extract_xpath_string(const gchar *xmldesc, obj = NULL; error: - if (obj) - xmlXPathFreeObject(obj); - if (ctxt) - xmlXPathFreeContext(ctxt); - if (xml) - xmlFreeDoc(xml); - if (pctxt) - xmlFreeParserCtxt(pctxt); + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + xmlFreeParserCtxt(pctxt); return port; } |