Changeset 918:46f9982b7d26 in freeDiameter

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)

Location:

libfdcore

Files:

• fdd.l (modified) (3 diffs)
• fdd.y (modified) (8 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; 
                         }

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);
+        }
 }
 
@@ -327 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
                                         yyerror (&yylloc, conf, "Error adding extension"); 
                                         YYERROR;
@@ -501 +502 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -509 +510 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -532 +533 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -572 +573 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -615 +616 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  fprintf(stderr, "Error at position : %s\n", err_pos);
+                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -632 +633 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;