From: Jason Parker <jparker@digium.com>
Date: Thu, 14 Jun 2007 23:23:35 +0000 (+0000)
Subject: Merged revisions 69470 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5bdba60741b7f79c86debdaaaf76ee33894519b;p=thirdparty%2Fasterisk.git

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

................
r69470 | qwell | 2007-06-14 18:22:51 -0500 (Thu, 14 Jun 2007) | 12 lines

Merged revisions 69469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69469 | qwell | 2007-06-14 18:21:45 -0500 (Thu, 14 Jun 2007) | 4 lines

Fix an issue where the line number in an unterminated comment block error message would show the wrong line number.

"Reported" to me on #asterisk (somebody posted an error message, and I happened to catch it)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/config.c b/main/config.c
index ad7138443d..2568dc7284 100644
--- a/main/config.c
+++ b/main/config.c
@@ -921,7 +921,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
 		fclose(f);		
 	} while (0);
 	if (comment) {
-		ast_log(LOG_WARNING,"Unterminated comment detected beginning on line %d\n", nest[comment]);
+		ast_log(LOG_WARNING,"Unterminated comment detected beginning on line %d\n", nest[comment - 1]);
 	}
 #ifdef AST_INCLUDE_GLOB
 					if (!cfg)