Merged revisions 69470 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 14 Jun 2007 23:23:35 +0000 (23:23 +0000)
committerJason Parker <jparker@digium.com>
Thu, 14 Jun 2007 23:23:35 +0000 (23:23 +0000)
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

main/config.c

index ad71384..2568dc7 100644 (file)
@@ -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)