Merged revisions 262419 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r262419 | pabelanger | 2010-05-11 15:40:37 -0400 (Tue, 11 May 2010) | 8 lines

  Improve logging by displaying line number

  (closes issue #16303)
  Reported by: dant
  Patches:
        issue16303.patch.v2 uploaded by pabelanger (license 224)
  Tested by: dant, lmadsen, pabelanger
........

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

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 1c99021f48c9328dda55cc68427d2f05bb126ca2..b50441334025e5392cde8ed1ba2b74344de96286 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1415,12 +1415,12 @@ static int pbx_load_config(const char *config_file)
                                                if (lastpri > -2)
                                                        ipri = lastpri + 1;
                                                else
-                                                       ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry!\n");
+                                                       ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry at line %d!\n", v->lineno);
                                        } else if (!strcmp(pri, "same") || !strcmp(pri, "s")) {
                                                if (lastpri > -2)
                                                        ipri = lastpri;
                                                else
-                                                       ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry!\n");
+                                                       ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry at line %d!\n", v->lineno);
                                        } else if (sscanf(pri, "%30d", &ipri) != 1 &&
                                            (ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) {
                                                ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
@@ -1452,7 +1452,7 @@ static int pbx_load_config(const char *config_file)
                                                        if ((end = strrchr(data, ')'))) {
                                                                *end = '\0';
                                                        } else {
-                                                               ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+                                                               ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s' %d\n", appl, data, v->lineno);
                                                        }
                                                }
                                                ast_free(orig_appl);
@@ -1476,11 +1476,11 @@ static int pbx_load_config(const char *config_file)
                        } else if (!strcasecmp(v->name, "include")) {
                                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
                                if (ast_context_add_include2(con, realvalue, registrar))
-                                       ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s'\n", v->value, cxt);
+                                       ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno);
                        } else if (!strcasecmp(v->name, "ignorepat")) {
                                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
                                if (ast_context_add_ignorepat2(con, realvalue, registrar))
-                                       ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt);
+                                       ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno);
                        } else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) {
                                char *stringp = realvalue;
                                char *appl, *data;
@@ -1492,7 +1492,7 @@ static int pbx_load_config(const char *config_file)
                                appl = strsep(&stringp, "/");
                                data = S_OR(stringp, "");
                                if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar))
-                                       ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s'\n", v->value, cxt);
+                                       ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno);
                        } else {
                                ast_log(LOG_WARNING, "==!!== Unknown directive: %s at line %d -- IGNORING!!!\n", v->name, v->lineno);
                        }