svn commit: r247764 - in head/sys/compat: linprocfs linux

[Eitan Adler]

Author: eadler
Date: Mon Mar  4 02:21:34 2013
New Revision: 247764
URL: http://svnweb.freebsd.org/changeset/base/247764

Log:
  Remove check for NULL prior to free(9) and m_freem(9).
  
  Approved by:  cperciva (mentor)

Modified:
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/compat/linux/linux_file.c
  head/sys/compat/linux/linux_socket.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c       Mon Mar  4 02:21:31 2013        
(r247763)
+++ head/sys/compat/linprocfs/linprocfs.c       Mon Mar  4 02:21:34 2013        
(r247764)
@@ -386,8 +386,7 @@ linprocfs_domtab(PFS_FILL_ARGS)
                sbuf_printf(sb, " 0 0\n");
        }
        mtx_unlock(&mountlist_mtx);
-       if (flep != NULL)
-               free(flep, M_TEMP);
+       free(flep, M_TEMP);
        return (error);
 }
 
@@ -447,8 +446,7 @@ linprocfs_dopartitions(PFS_FILL_ARGS)
        }
        g_topology_unlock();
 
-       if (flep != NULL)
-               free(flep, M_TEMP);
+       free(flep, M_TEMP);
        return (error);
 }
 

Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c  Mon Mar  4 02:21:31 2013        
(r247763)
+++ head/sys/compat/linux/linux_file.c  Mon Mar  4 02:21:34 2013        
(r247764)
@@ -517,8 +517,7 @@ eof:
        td->td_retval[0] = nbytes - resid;
 
 out:
-       if (cookies)
-               free(cookies, M_TEMP);
+       free(cookies, M_TEMP);
 
        VOP_UNLOCK(vp, 0);
        foffset_unlock(fp, off, 0);

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c        Mon Mar  4 02:21:31 2013        
(r247763)
+++ head/sys/compat/linux/linux_socket.c        Mon Mar  4 02:21:34 2013        
(r247764)
@@ -1443,10 +1443,8 @@ out:
 
 bad:
        free(iov, M_IOV);
-       if (control != NULL)
-               m_freem(control);
-       if (linux_cmsg != NULL)
-               free(linux_cmsg, M_TEMP);
+       m_freem(control);
+       free(linux_cmsg, M_TEMP);
 
        return (error);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"