cleanup: remove NULL checks before free() all over the code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 21 insertions, 25 deletions

diff --git a/libmenu/menu.c b/libmenu/menu.c
index a9e40af177..8a9cb28872 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -126,7 +126,7 @@ static int menu_parse_config(char* buffer, struct m_config *mconfig)
     if(!name) {
       mp_tmsg(MSGT_GLOBAL,MSGL_WARN,"[MENU] Menu definitions need a name attribute (line %d).\n",parser->line);
       free(element);
-      if(body) free(body);
+      free(body);
       asx_free_attribs(attribs);
       continue;
     }
@@ -217,7 +217,7 @@ static int menu_parse_config(char* buffer, struct m_config *mconfig)
     } else {
       mp_tmsg(MSGT_GLOBAL,MSGL_WARN,"[MENU] unknown menu type '%s' at line %d\n",element,parser->line);
       free(name);
-      if(body) free(body);
+      free(body);
     }
 
     free(element);
@@ -285,7 +285,7 @@ void menu_uninit(void) {
   for(i = 0 ; menu_list && menu_list[i].name ; i++) {
     free(menu_list[i].name);
     m_struct_free(&menu_list[i].type->priv_st,menu_list[i].cfg);
-    if(menu_list[i].args) free(menu_list[i].args);
+    free(menu_list[i].args);
   }
   free(menu_list);
   menu_count = 0;
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c
index d09c45fc8d..5b7812be5e 100644
--- a/libmenu/menu_cmdlist.c
+++ b/libmenu/menu_cmdlist.c
@@ -93,14 +93,10 @@ static void read_cmd(menu_t* menu,int cmd) {
 }
 
 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);
 }
@@ -132,7 +128,7 @@ static int parse_args(menu_t* menu,char* args) {
     if(!name) {
       mp_tmsg(MSGT_GLOBAL,MSGL_WARN,"[MENU] List menu entry definitions need a name (line %d).\n",parser->line);
       free(element);
-      if(body) free(body);
+      free(body);
       asx_free_attribs(attribs);
       continue;
     }
@@ -145,7 +141,7 @@ static int parse_args(menu_t* menu,char* args) {
     menu_list_add_entry(menu,m);
 
     free(element);
-    if(body) free(body);
+    free(body);
     asx_free_attribs(attribs);
   }
 }
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index 8e82412327..dd706b65cb 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -141,7 +141,7 @@ static void add_line(struct menu_priv_s* priv, char* l) {
     return;
   }
 
-  if(priv->num_lines >= priv->buf_lines && priv->lines[priv->last_line])
+  if(priv->num_lines >= priv->buf_lines)
     free(priv->lines[priv->last_line]);
   else
     priv->num_lines++;
diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c
index aa15cc0147..047ddaca97 100644
--- a/libmenu/menu_filesel.c
+++ b/libmenu/menu_filesel.c
@@ -238,8 +238,7 @@ static int open_dir(menu_t* menu,char* args) {
 
   menu_list_init(menu);
 
-  if(mpriv->dir)
-    free(mpriv->dir);
+  free(mpriv->dir);
   mpriv->dir = strdup(args);
   if(mpriv->p.title && mpriv->p.title != mpriv->title && mpriv->p.title != cfg_dflt.p.title)
     free(mpriv->p.title);
diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c
index 135761b3d0..a4acd2bcca 100644
--- a/libmenu/menu_param.c
+++ b/libmenu/menu_param.c
@@ -83,7 +83,7 @@ static void entry_set_text(menu_t* menu, list_entry_t* e) {
     mp_property_print(e->prop, menu->ctx);
   int l,edit = (mpriv->edit && e == mpriv->p.current);
   if(!val || !val[0]) {
-    if(val) free(val);
+    free(val);
     if(mpriv->hide_na) {
       e->p.hide = 1;
       return;
@@ -92,7 +92,7 @@ static void entry_set_text(menu_t* menu, list_entry_t* e) {
   } else if(mpriv->hide_na)
       e->p.hide = 0;
   l = strlen(e->name) + 2 + strlen(val) + (edit ? 4 : 0) + 1;
-  if(e->p.txt) free(e->p.txt);
+  free(e->p.txt);
   e->p.txt = malloc(l);
   sprintf(e->p.txt,"%s: %s%s%s",e->name,edit ? "> " : "",val,edit ? " <" : "");
   free(val);
@@ -153,7 +153,8 @@ static int parse_args(menu_t* menu,char* args) {
     txt = asx_get_attrib("txt",attribs);
     if(!(name || txt)) {
       mp_tmsg(MSGT_OSD_MENU,MSGL_WARN,"[MENU] Pref menu entry definitions need a valid 'property' or 'txt' attribute (line %d).\n",parser->line);
-      if(txt) free(txt), txt = NULL;
+      free(txt);
+      txt = NULL;
       goto next_element;
     }
     m = calloc(1,sizeof(struct list_entry_s));
@@ -176,8 +177,8 @@ static int parse_args(menu_t* menu,char* args) {
 
   next_element:
     free(element);
-    if(body) free(body);
-    if(name) free(name);
+    free(body);
+    free(name);
     asx_free_attribs(attribs);
   }
 }
@@ -253,10 +254,10 @@ static void read_cmd(menu_t* menu,int cmd) {
 
 static void free_entry(list_entry_t* entry) {
   free(entry->p.txt);
-  if(entry->name) free(entry->name);
-  if(entry->txt)  free(entry->txt);
-  if(entry->prop) free(entry->prop);
-  if(entry->menu) free(entry->menu);
+  free(entry->name);
+  free(entry->txt);
+  free(entry->prop);
+  free(entry->menu);
   free(entry);
 }