Changeset 974:2091bf698fb1 in freeDiameter for libfdcore/fdd.l

Timestamp:

Mar 15, 2013, 2:14:35 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR
(as far as sed could find them)
with manual fixing afterwards.

File:

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

libfdcore/fdd.l

@@ -84 +84 @@
 int globerrfct(const char *epath, int eerrno)
 {
-        TRACE_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
+        TRACE_ERROR("Failed to scan %s: %s", epath, strerror(eerrno));
         return 1;
 }
@@ -119 +119 @@
                         if (buf[yyleng-2] != '"')
                         {
-                                TRACE_ERROR("Unterminated string: %s\n", yytext);
+                                TRACE_ERROR("Unterminated string: %s", yytext);
                                 return LEX_ERROR;
                         }
@@ -126 +126 @@
                         if (current_nested_level >= MAX_NESTED_CONF_FILES)
                         {
-                                TRACE_ERROR("Too many recursion levels in configuration files includes\n");
+                                TRACE_ERROR("Too many recursion levels in configuration files includes");
                                 return LEX_ERROR;
                         }
@@ -135 +135 @@
                         if (globerror == GLOB_NOSPACE)
                         {
-                                TRACE_ERROR("Not enough memory to parse include directive.\n");
+                                TRACE_ERROR("Not enough memory to parse include directive.");
                                 return LEX_ERROR;
                         }
                         if (globerror == GLOB_ABORTED)
                         {
-                                TRACE_ERROR("An error was encountered in include directive.\n");
+                                TRACE_ERROR("An error was encountered in include directive.");
                                 return LEX_ERROR;
                         }
@@ -150 +150 @@
                         if (globerror)
                         {
-                                TRACE_ERROR("Unexpected error in glob (%d).\n", globerror);
+                                TRACE_ERROR("Unexpected error in glob (%d).", globerror);
                                 return LEX_ERROR;
                         }
@@ -234 +234 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        TRACE_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", 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_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'.", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }