[asterisk-commits] kpfleming: branch 1.6.1 r152814 - in /branches/1.6.1: ./ main/cdr.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Oct 30 11:55:21 2008
New Revision: 152814

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152814
Log:
Merged revisions 152812 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152812 | kpfleming | 2008-10-30 11:54:29 -0500 (Thu, 30 Oct 2008) | 9 lines
  
  Merged revisions 152811 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152811 | kpfleming | 2008-10-30 11:53:48 -0500 (Thu, 30 Oct 2008) | 3 lines
    
    instead of comparing the string pointer to 0, let's compare the value that was actually parsed out of the string (found by sparse)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/cdr.c

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

Modified: branches/1.6.1/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/cdr.c?view=diff&rev=152814&r1=152813&r2=152814
==============================================================================
--- branches/1.6.1/main/cdr.c (original)
+++ branches/1.6.1/main/cdr.c Thu Oct 30 11:55:21 2008
@@ -1418,7 +1418,7 @@
 		if ((size_value = ast_variable_retrieve(config, "general", "size"))) {
 			if (sscanf(size_value, "%d", &cfg_size) < 1)
 				ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", size_value);
-			else if (size_value < 0)
+			else if (cfg_size < 0)
 				ast_log(LOG_WARNING, "Invalid maximum batch size '%d' specified, using default\n", cfg_size);
 			else
 				batchsize = cfg_size;
@@ -1426,7 +1426,7 @@
 		if ((time_value = ast_variable_retrieve(config, "general", "time"))) {
 			if (sscanf(time_value, "%d", &cfg_time) < 1)
 				ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", time_value);
-			else if (time_value < 0)
+			else if (cfg_time < 0)
 				ast_log(LOG_WARNING, "Invalid maximum batch time '%d' specified, using default\n", cfg_time);
 			else
 				batchtime = cfg_time;