Remove unnecessary NULL checks before freeing memory blocks.

The following functions check for NULL internally:
 free, kfree, xfree, free_xenheap_page[s]

Signed-off-by: Keir Fraser <keir@xensource.com>

5 files changed, 12 insertions, 23 deletions

diff --git a/tools/blktap/blkif.c b/tools/blktap/blkif.c
index f4f386ced1..73afc50d95 100644
--- a/tools/blktap/blkif.c
+++ b/tools/blktap/blkif.c
@@ -108,8 +108,7 @@ void free_blkif(blkif_t *blkif)
         }
         pblkif = &curs->hash_next;
     }
-    if (blkif != NULL)
-        free(blkif);
+    free(blkif);
 }
 
 void blkif_register_request_hook(blkif_t *blkif, char *name, 
diff --git a/tools/blktap/parallax/blockstore.c b/tools/blktap/parallax/blockstore.c
index 7967edb555..cecca2752a 100644
--- a/tools/blktap/parallax/blockstore.c
+++ b/tools/blktap/parallax/blockstore.c
@@ -604,8 +604,7 @@ void *readblock_indiv(int server, uint64_t id) {
     return block;
 
     err:
-    if (qe->block)
-        free(qe->block);
+    free(qe->block);
     free((void *)qe);
     return NULL;
 }
@@ -1072,7 +1071,7 @@ uint64_t allocblock_hint(void *block, uint64_t hint) {
  *
  *   @return: pointer to new block, NULL on error
  */
-void *newblock() {
+void *newblock(void) {
     void *block = malloc(BLOCK_SIZE);
     if (block == NULL) {
         perror("newblock");
@@ -1089,7 +1088,6 @@ void *newblock() {
  *   @block: block to be freed
  */
 void freeblock(void *block) {
-    if (block != NULL)
         free(block);
 }
 
diff --git a/tools/blktap/parallax/blockstored.c b/tools/blktap/parallax/blockstored.c
index 1ed2489b6c..76d5c009d8 100644
--- a/tools/blktap/parallax/blockstored.c
+++ b/tools/blktap/parallax/blockstored.c
@@ -232,7 +232,7 @@ uint64_t allocblock(void *block) {
  *
  *   @return: pointer to new block, NULL on error
  */
-void *newblock() {
+void *newblock(void) {
     void *block = malloc(BLOCK_SIZE);
     if (block == NULL) {
         perror("newblock");
@@ -249,7 +249,6 @@ void *newblock() {
  *   @block: block to be freed
  */
 void freeblock(void *block) {
-    if (block != NULL)
         free(block);
 }
 
diff --git a/tools/blktap/parallax/requests-async.c b/tools/blktap/parallax/requests-async.c
index e89cb909ba..75d3aa2f23 100755
--- a/tools/blktap/parallax/requests-async.c
+++ b/tools/blktap/parallax/requests-async.c
@@ -715,7 +715,7 @@ static void write_cb(struct io_ret r, void *param)
         r.u.i  = -1;
         /* free any saved node vals. */
         for (i=0; i<3; i++)
-            if (req->radix[i] != 0) free(req->radix[i]);
+            free(req->radix[i]);
         free(req);
         cb(r, req_param);
     }
diff --git a/tools/blktap/xenbus.c b/tools/blktap/xenbus.c
index 99ba9ea49e..93f21eb6bd 100644
--- a/tools/blktap/xenbus.c
+++ b/tools/blktap/xenbus.c
@@ -339,10 +339,8 @@ static int backend_remove(struct xs_handle *h, struct backend_info *be)
     /* Free everything else. */
     if (be->blkif)
         free_blkif(be->blkif);
-    if (be->frontpath)
-        free(be->frontpath);
-    if (be->backpath)
-        free(be->backpath);
+    free(be->frontpath);
+    free(be->backpath);
     free(be);
     return 0;
 }
@@ -406,8 +404,7 @@ static void frontend_changed(struct xs_handle *h, struct xenbus_watch *w,
     return;
 
  fail:
-    if (fepath)
-        free(fepath);
+    free(fepath);
 }
 
 
@@ -460,9 +457,7 @@ static void backend_changed(struct xs_handle *h, struct xenbus_watch *w,
     }
 
  fail:
-    if (path)
-        free(path);
-
+    free(path);
 }
 
 static void blkback_probe(struct xs_handle *h, struct xenbus_watch *w, 
@@ -537,12 +532,10 @@ static void blkback_probe(struct xs_handle *h, struct xenbus_watch *w,
 	return;
 
  free_be:
-	if ((be) && (be->backend_watch.node))
+	if (be && (be->backend_watch.node))
             unregister_xenbus_watch(h, &be->backend_watch);
-	if (frontend)
-            free(frontend);
-        if (bepath)
-            free(bepath);
+        free(frontend);
+        free(bepath);
 	free(be);
 	return;
 }