[svn-commits] tilghman: branch 1.6.0 r132110 - in /branches/1.6.0: ./ main/config.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 18 13:51:20 2008
New Revision: 132110

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132110
Log:
Merged revisions 132109 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r132109 | tilghman | 2008-07-18 13:50:37 -0500 (Fri, 18 Jul 2008) | 14 lines

Merged revisions 132107 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132107 | tilghman | 2008-07-18 13:47:50 -0500 (Fri, 18 Jul 2008) | 6 lines

Textual clarification
(closes issue #13106)
 Reported by: flefoll
 Patches: 
       config.c.br14.120173.patch-unknown-directive uploaded by flefoll (license 244)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/config.c

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

Modified: branches/1.6.0/main/config.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/config.c?view=diff&rev=132110&r1=132109&r2=132110
==============================================================================
--- branches/1.6.0/main/config.c (original)
+++ branches/1.6.0/main/config.c Fri Jul 18 13:51:20 2008
@@ -1028,7 +1028,7 @@
 				return 0;	/* XXX is this correct ? or we should return -1 ? */
 			}
 		} else {
-			ast_log(LOG_WARNING, "Unknown directive '%s' at line %d of %s\n", cur, lineno, configfile);
+			ast_log(LOG_WARNING, "Unknown directive '#%s' at line %d of %s\n", cur, lineno, configfile);
 			return 0;	/* XXX is this correct ? or we should return -1 ? */
 		}