[svn-commits] dbrooks: trunk r203721 - /trunk/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: dbrooks
Date: Fri Jun 26 15:13:51 2009
New Revision: 203721

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203721
Log:
Fixing voicemail's error in checking max silence vs min message length

Max silence was represented in milliseconds, yet vmminsecs (minmessage) was represented
as seconds.

Also, the inequality was reversed. The warning, if triggered, was "Max silence should 
be less than minmessage or you may get empty messages", which should have been logged 
if max silence was greater than minmessage, but the check was for less than.

Also, conforming if statement to coding guidelines.

closes issue #15331)
Reported by: markd

Review: https://reviewboard.asterisk.org/r/293/

Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=203721&r1=203720&r2=203721
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Jun 26 15:13:51 2009
@@ -10750,8 +10750,9 @@
 		if ((val = ast_variable_retrieve(cfg, "general", "minsecs"))) {
 			if (sscanf(val, "%d", &x) == 1) {
 				vmminsecs = x;
-				if (maxsilence <= vmminsecs)
+				if (maxsilence / 1000 >= vmminsecs) {
 					ast_log(AST_LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
+				}
 			} else {
 				ast_log(AST_LOG_WARNING, "Invalid min message time length\n");
 			}
@@ -10763,8 +10764,9 @@
 			}
 			if (sscanf(val, "%d", &x) == 1) {
 				vmminsecs = x;
-				if (maxsilence <= vmminsecs)
+				if (maxsilence / 1000 >= vmminsecs) {
 					ast_log(AST_LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
+				}
 			} else {
 				ast_log(AST_LOG_WARNING, "Invalid min message time length\n");
 			}