[asterisk-commits] dvossel: trunk r336092 - in /trunk: ./ main/format_cap.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Sep 15 10:19:51 2011
New Revision: 336092

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336092
Log:
Merged revisions 336091 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r336091 | dvossel | 2011-09-15 10:19:10 -0500 (Thu, 15 Sep 2011) | 2 lines
  
  Removes some no-op code found in format_cap.c.
........

Modified:
    trunk/   (props changed)
    trunk/main/format_cap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/format_cap.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format_cap.c?view=diff&rev=336092&r1=336091&r2=336092
==============================================================================
--- trunk/main/format_cap.c (original)
+++ trunk/main/format_cap.c Thu Sep 15 10:19:51 2011
@@ -521,8 +521,6 @@
 	}
 	result = ast_format_cap_destroy(result);
 
-	/* Remember to always free the NULL before returning it. */
-	ast_free(NULL);
 	return NULL;
 }