kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 152812 via svnmerge from

Browse Source 
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)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-10-30 16:55:21 +00:00
parent 4d7069055a
commit db5d4c1619
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/cdr.c
View File

@@ -1418,7 +1418,7 @@ static int do_reload(int reload)
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 @@ static int do_reload(int reload)
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;