Remove useless "if" before "free".

elf/ldconfig.c

@@ -1184,8 +1184,7 @@ parse_conf_include (const char *config_file, unsigned int lineno,
       break;
     }
 
-  if (copy)
+  free (copy);
-    free (copy);
 }
 
 /* Honour LD_HWCAP_MASK.  */

gmon/gmon.c

@@ -396,6 +396,5 @@ _mcleanup (void)
     write_gmon ();
 
   /* free the memory. */
-  if (_gmonparam.tos != NULL)
+  free (_gmonparam.tos);
-    free (_gmonparam.tos);
 }

iconv/gconv_conf.c

@@ -529,8 +529,7 @@ __gconv_get_path (void)
 
       __gconv_path_elem = result ?: (struct path_elem *) &empty_path_elem;
 
-      if (cwd != NULL)
+      free (cwd);
-	free (cwd);
     }
 
   __libc_lock_unlock (lock);

inet/rcmd.c

@@ -826,8 +826,7 @@ __validuser2_sa(hostf, ra, ralen, luser, ruser, rhost)
 	}
     }
 
-    if (buf != NULL)
+    free (buf);
-      free (buf);
 
     return retval;
 }

intl/bindtextdom.c

@@ -203,8 +203,7 @@ set_binding_values (domainname, dirnamep, codesetp)
 
 		  if (__builtin_expect (result != NULL, 1))
 		    {
-		      if (binding->codeset != NULL)
+		      free (binding->codeset);
-			free (binding->codeset);
 
 		      binding->codeset = result;
 		      modified = 1;

intl/loadmsgcat.c

@@ -1236,8 +1236,7 @@ _nl_load_domain (domain_file, domainbinding)
       /* This is an invalid revision.  */
     invalid:
       /* This is an invalid .mo file.  */
-      if (domain->malloced)
+      free (domain->malloced);
-	free (domain->malloced);
 #ifdef HAVE_MMAP
       if (use_mmap)
 	munmap ((caddr_t) data, size);
@@ -1289,12 +1288,10 @@ _nl_unload_domain (domain)
       if (convd->conv != (__gconv_t) -1)
 	__gconv_close (convd->conv);
     }
-  if (domain->conversions != NULL)
+  free (domain->conversions);
-    free (domain->conversions);
   __libc_rwlock_fini (domain->conversions_lock);
 
-  if (domain->malloced)
+  free (domain->malloced);
-    free (domain->malloced);
 
 # ifdef _POSIX_MAPPED_FILES
   if (domain->use_mmap)

libidn/stringprep.c

@@ -366,8 +366,7 @@ stringprep (char *in,
 
   do
     {
-      if (ucs4)
+      free (ucs4);
-	free (ucs4);
       ucs4 = stringprep_utf8_to_ucs4 (in, -1, &ucs4len);
       maxucs4len = ucs4len + adducs4len;
       uint32_t *newp = realloc (ucs4, maxucs4len * sizeof (uint32_t));
@@ -449,8 +448,7 @@ stringprep_profile (const char *in,
 
   do
     {
-      if (str)
+      free (str);
-	free (str);
       str = (char *) malloc (len);
       if (str == NULL)
 	return STRINGPREP_MALLOC_ERROR;

libio/genops.c

@@ -300,8 +300,7 @@ save_for_backup (fp, end_p)
 	memcpy (new_buffer + avail,
 		fp->_IO_read_base + least_mark,
 		needed_size);
-      if (fp->_IO_save_base)
+      free (fp->_IO_save_base);
-	free (fp->_IO_save_base);
       fp->_IO_save_base = new_buffer;
       fp->_IO_save_end = new_buffer + avail + needed_size;
     }

libio/wgenops.c

@@ -553,8 +553,7 @@ save_for_wbackup (fp, end_p)
 		  needed_size * sizeof (wchar_t));
 #endif
 	}
-      if (fp->_wide_data->_IO_save_base)
+      free (fp->_wide_data->_IO_save_base);
-	free (fp->_wide_data->_IO_save_base);
       fp->_wide_data->_IO_save_base = new_buffer;
       fp->_wide_data->_IO_save_end = new_buffer + avail + needed_size;
     }

locale/programs/ld-collate.c

@@ -2963,10 +2963,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
 		col_elem_free:
 		  if (symbol != NULL)
 		    free ((char *) symbol);
-		  if (arg->val.str.startmb != NULL)
+		  free (arg->val.str.startmb);
-		    free (arg->val.str.startmb);
+		  free (arg->val.str.startwc);
-		  if (arg->val.str.startwc != NULL)
-		    free (arg->val.str.startwc);
 		}
 	      lr_ignore_rest (ldfile, 1);
 	    }
@@ -3112,10 +3110,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
 	      else
 		{
 		col_sym_free:
-		  if (symbol != NULL)
+		  free (symbol);
-		    free (symbol);
+		  free (endsymbol);
-		  if (endsymbol != NULL)
-		    free (endsymbol);
 		}
 	    }
 	  break;

locale/programs/linereader.c

@@ -859,8 +859,7 @@ non-symbolic character value should not be used"));
       if (illegal_string)
 	{
 	  free (buf);
-	  if (buf2 != NULL)
+	  free (buf2);
-	    free (buf2);
 	  lr->token.val.str.startmb = NULL;
 	  lr->token.val.str.lenmb = 0;
 	  lr->token.val.str.startwc = NULL;

nis/nss_compat/compat-pwd.c

@@ -116,16 +116,11 @@ init_nss_interface (void)
 static void
 give_pwd_free (struct passwd *pwd)
 {
-  if (pwd->pw_name != NULL)
+  free (pwd->pw_name);
-    free (pwd->pw_name);
+  free (pwd->pw_passwd);
-  if (pwd->pw_passwd != NULL)
+  free (pwd->pw_gecos);
-    free (pwd->pw_passwd);
+  free (pwd->pw_dir);
-  if (pwd->pw_gecos != NULL)
+  free (pwd->pw_shell);
-    free (pwd->pw_gecos);
-  if (pwd->pw_dir != NULL)
-    free (pwd->pw_dir);
-  if (pwd->pw_shell != NULL)
-    free (pwd->pw_shell);
 
   memset (pwd, '\0', sizeof (struct passwd));
 }

nis/nss_compat/compat-spwd.c

@@ -113,10 +113,8 @@ init_nss_interface (void)
 static void
 give_spwd_free (struct spwd *pwd)
 {
-  if (pwd->sp_namp != NULL)
+  free (pwd->sp_namp);
-    free (pwd->sp_namp);
+  free (pwd->sp_pwdp);
-  if (pwd->sp_pwdp != NULL)
-    free (pwd->sp_pwdp);
 
   memset (pwd, '\0', sizeof (struct spwd));
   pwd->sp_warn = -1;

resolv/res_debug.c

@@ -204,8 +204,7 @@ do_section(const res_state statp,
 		rrnum++;
 	}
  cleanup:
-	if (buf != NULL)
+	free(buf);
-		free(buf);
 }
 
 /*

sunrpc/xdr_sizeof.c

@@ -86,8 +86,7 @@ x_inline (XDR *xdrs, u_int len)
   else
     {
       /* Free the earlier space and allocate new area */
-      if (xdrs->x_private)
+      free (xdrs->x_private);
-	free (xdrs->x_private);
       if ((xdrs->x_private = (caddr_t) malloc (len)) == NULL)
 	{
 	  xdrs->x_base = 0;
@@ -157,7 +156,6 @@ xdr_sizeof (xdrproc_t func, void *data)
   x.x_base = (caddr_t) 0;
 
   stat = func (&x, data);
-  if (x.x_private)
+  free (x.x_private);
-    free (x.x_private);
   return stat == TRUE ? x.x_handy : 0;
 }

sysdeps/mach/hurd/if_index.c

@@ -59,8 +59,7 @@ if_freenameindex (struct if_nameindex *ifn)
   struct if_nameindex *ptr = ifn;
   while (ptr->if_name || ptr->if_index)
     {
-      if (ptr->if_name)
+      free (ptr->if_name);
-        free (ptr->if_name);
       ++ptr;
     }
   free (ifn);

sysdeps/posix/sprofil.c

@@ -322,8 +322,7 @@ __sprofil (struct prof *profp, int profcnt, struct timeval *tvp,
   for (i = 0; i < profcnt; ++i)
     if (add_region (p[i], (flags & PROF_UINT) != 0) < 0)
       {
-	if (prof_info.region)
+	free (prof_info.region);
-	  free (prof_info.region);
 	prof_info.num_regions = 0;
 	prof_info.region = NULL;
 	return -1;

time/lc-time-cleanup.c

@@ -29,12 +29,9 @@ _nl_cleanup_time (struct locale_data *locale)
       locale->private.time = NULL;
       locale->private.cleanup = NULL;
 
-      if (data->eras != NULL)
+      free (data->eras);
-	free (data->eras);
+      free (data->alt_digits);
-      if (data->alt_digits != NULL)
+      free (data->walt_digits);
-	free (data->alt_digits);
-      if (data->walt_digits != NULL)
-	free (data->walt_digits);
 
       free (data);
     }

time/tzset.c

@@ -414,8 +414,7 @@ tzset_internal (always, explicit)
   tz_rules[1].name = NULL;
 
   /* Save the value of `tz'.  */
-  if (old_tz != NULL)
+  free (old_tz);
-    free (old_tz);
   old_tz = tz ? __strdup (tz) : NULL;
 
   /* Try to read a data file.  */