Changeset 969:6808de455810 in freeDiameter for libfdcore/fdd.l

Timestamp:

Mar 13, 2013, 1:43:30 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Children:

970:ec348f604399, 972:ce3cacbbccc9

Parents:

966:8862d9dece66 (diff), 968:652713ce3596 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Remerged

Files:

• libfdcore/fdd.l (modified) (1 diff)
• libfdcore/fdd.l (modified) (9 diffs)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_ERROR(                                            \
+        fd_log_debug(                                                   \
                 "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \

libfdcore/fdd.l

@@ -84 +84 @@
 int globerrfct(const char *epath, int eerrno)
 {
-        TRACE_DEBUG_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
+        TRACE_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
         return 1;
 }
@@ -119 +119 @@
                         if (buf[yyleng-2] != '"')
                         {
-                                TRACE_DEBUG_ERROR("Unterminated string: %s\n", yytext);
+                                TRACE_ERROR("Unterminated string: %s\n", yytext);
                                 return LEX_ERROR;
                         }
@@ -126 +126 @@
                         if (current_nested_level >= MAX_NESTED_CONF_FILES)
                         {
-                                TRACE_DEBUG_ERROR("Too many recursion levels in configuration files includes\n");
+                                TRACE_ERROR("Too many recursion levels in configuration files includes\n");
                                 return LEX_ERROR;
                         }
@@ -135 +135 @@
                         if (globerror == GLOB_NOSPACE)
                         {
-                                TRACE_DEBUG_ERROR("Not enough memory to parse include directive.\n");
+                                TRACE_ERROR("Not enough memory to parse include directive.\n");
                                 return LEX_ERROR;
                         }
                         if (globerror == GLOB_ABORTED)
                         {
-                                TRACE_DEBUG_ERROR("An error was encountered in include directive.\n");
+                                TRACE_ERROR("An error was encountered in include directive.\n");
                                 return LEX_ERROR;
                         }
@@ -150 +150 @@
                         if (globerror)
                         {
-                                TRACE_DEBUG_ERROR("Unexpected error in glob (%d).\n", globerror);
+                                TRACE_ERROR("Unexpected error in glob (%d).\n", globerror);
                                 return LEX_ERROR;
                         }
@@ -166 +166 @@
                         if ( ! yyin )
                         {
-                                TRACE_DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno));
+                                TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno));
                                 return LEX_ERROR;
                         }
@@ -206 +206 @@
                                 if ( ! yyin )
                                 {
-                                        TRACE_DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno));
+                                        TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno));
                                         return LEX_ERROR;
                                 }
@@ -234 +234 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        TRACE_DEBUG_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
+                                        TRACE_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? */
@@ -277 +277 @@
         /* Unrecognized character */
 <*>.                    {
-                                TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
+                                TRACE_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }