Merged revisions 152811 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 30 Oct 2008 16:54:29 +0000 (16:54 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 30 Oct 2008 16:54:29 +0000 (16:54 +0000)
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/trunk@152812 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/cdr.c

index cf9d1bc..e731483 100644 (file)
@@ -1425,7 +1425,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;
@@ -1433,7 +1433,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;