[svn-commits] tilghman: trunk r48384 - in /trunk: ./ funcs/func_strings.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Sun Dec 10 23:40:38 2006
New Revision: 48384

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48384
Log:
Merged revisions 48382 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48382 | tilghman | 2006-12-10 23:37:09 -0600 (Sun, 10 Dec 2006) | 2 lines

STRFTIME() does not actually require an argument (issue 8540)

........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_strings.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_strings.c?view=diff&rev=48384&r1=48383&r2=48384
==============================================================================
--- trunk/funcs/func_strings.c (original)
+++ trunk/funcs/func_strings.c Sun Dec 10 23:40:38 2006
@@ -425,12 +425,6 @@
 
 	buf[0] = '\0';
 
-	if (ast_strlen_zero(parse)) {
-		ast_log(LOG_ERROR,
-				"Asterisk function STRFTIME() requires an argument.\n");
-		return -1;
-	}
-
 	AST_STANDARD_APP_ARGS(args, parse);
 
 	ast_get_time_t(args.epoch, &epochi, time(NULL), NULL);