[svn-commits] dbrooks: branch 1.6.0 r203722 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: dbrooks
Date: Fri Jun 26 15:16:24 2009
New Revision: 203722

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

........
  r203721 | dbrooks | 2009-06-26 15:13:51 -0500 (Fri, 26 Jun 2009) | 16 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

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

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=203722&r1=203721&r2=203722
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Fri Jun 26 15:16:24 2009
@@ -9380,8 +9380,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(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
+				}
 			} else {
 				ast_log(LOG_WARNING, "Invalid min message time length\n");
 			}
@@ -9393,8 +9394,9 @@
 			}
 			if (sscanf(val, "%d", &x) == 1) {
 				vmminsecs = x;
-				if (maxsilence <= vmminsecs)
+				if (maxsilence / 1000 >= vmminsecs) {
 					ast_log(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
+				}
 			} else {
 				ast_log(LOG_WARNING, "Invalid min message time length\n");
 			}