Changeset 944:6cdb2a54aaf6 in freeDiameter

Timestamp:

Feb 12, 2013, 7:51:10 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Log config file errors using the standard logging framework instead of fprintf.

Location:

libfdcore

Files:

• fdd.l (modified) (3 diffs)
• fdd.y (modified) (1 diff)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG(FULL,                                               \
-                "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
+        TRACE_DEBUG_ERROR("(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n",       \
                 yylloc->first_line, yylloc->first_column,               \
                 yylloc->last_line, yylloc->last_column,                 \
@@ -104 +103 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        fprintf(stderr, "Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
+                                        TRACE_DEBUG_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
                                         return LEX_ERROR; /* trig an error in yacc parser */
                                         /* Maybe we could REJECT instead of failing here? */
@@ -147 +146 @@
         /* Unrecognized character */
 <*>.                    { 
-                                fprintf(stderr, "Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
+                                TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }

libfdcore/fdd.y

@@ -62 +62 @@
 void yyerror (YYLTYPE *ploc, struct fd_config * conf, char const *s)
 {
-        if (ploc->first_line != ploc->last_line)
-                fprintf(stderr, "%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
-        else if (ploc->first_column != ploc->last_column)
-                fprintf(stderr, "%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
-        else
-                fprintf(stderr, "%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+        if (ploc->first_line != ploc->last_line) {
+                TRACE_DEBUG_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
+        } else if (ploc->first_column != ploc->last_column) {
+                TRACE_DEBUG_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
+        } else {
+                TRACE_DEBUG_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+        }
 }