[svn-commits] twilson: branch 1.6.0 r203387 - in /branches/1.6.0: ./ main/cli.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Jun 25 16:18:21 2009
New Revision: 203387

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203387
Log:
Merged revisions 203381 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203381 | twilson | 2009-06-25 16:15:11 -0500 (Thu, 25 Jun 2009) | 11 lines
  
  Merged revisions 203380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203380 | twilson | 2009-06-25 16:13:10 -0500 (Thu, 25 Jun 2009) | 4 lines
    
    I didn't see that Mark already fixed the underlying issue!
    
    Yay for removing useless code.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/cli.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/cli.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/cli.c?view=diff&rev=203387&r1=203386&r2=203387
==============================================================================
--- branches/1.6.0/main/cli.c (original)
+++ branches/1.6.0/main/cli.c Thu Jun 25 16:18:21 2009
@@ -135,8 +135,8 @@
 		c += (strlen(ast_config_AST_MODULE_DIR) + 1);
 	if (c)
 		c = ast_strdup(c);
-	if (d)
-		free(d);
+
+	free(d);
 	
 	return c;
 }