Changeset 918:46f9982b7d26 in freeDiameter for libfdcore/fdd.l

Timestamp:

Feb 12, 2013, 10:57:32 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Use logging routines for configuration file parsing (based on patch by Thomas)

File:

• libfdcore/fdd.l (modified) (3 diffs)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG(FULL,                                               \
+        TRACE_DEBUG_ERROR(                                              \
                 "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \
@@ -104 +104 @@
                                 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? */
@@ -146 +146 @@
 <*>[[:alnum:]]+         |       /* This rule is only useful to print a complete token in error messages */
         /* 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; 
                         }