diff libmenu/menu_cmdlist.c @ 32537:8fa2f43cb760

Remove most of the NULL pointer check before free all over the code
author cboesch
date Sun, 14 Nov 2010 09:12:34 +0000
parents 9e627a1793b1
children
line wrap: on
line diff
--- a/libmenu/menu_cmdlist.c	Sat Nov 13 10:23:34 2010 +0000
+++ b/libmenu/menu_cmdlist.c	Sun Nov 14 09:12:34 2010 +0000
@@ -94,14 +94,10 @@
 }
 
 static void free_entry(list_entry_t* entry) {
-  if(entry->ok)
-    free(entry->ok);
-  if(entry->cancel)
-    free(entry->cancel);
-  if(entry->left)
-    free(entry->left);
-  if(entry->right)
-    free(entry->right);
+  free(entry->ok);
+  free(entry->cancel);
+  free(entry->left);
+  free(entry->right);
   free(entry->p.txt);
   free(entry);
 }
@@ -133,7 +129,7 @@
     if(!name) {
       mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_ListMenuEntryDefinitionsNeedAName,parser->line);
       free(element);
-      if(body) free(body);
+      free(body);
       asx_free_attribs(attribs);
       continue;
     }
@@ -146,7 +142,7 @@
     menu_list_add_entry(menu,m);
 
     free(element);
-    if(body) free(body);
+    free(body);
     asx_free_attribs(attribs);
   }
 }