Changeset 974:2091bf698fb1 in freeDiameter for extensions/rt_ereg

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.

Location:

extensions/rt_ereg

Files:

• rtereg_conf.l (modified) (3 diffs)
• rtereg_conf.y (modified) (2 diffs)

extensions/rt_ereg/rtereg_conf.l

@@ -81 +81 @@
                                 CHECK_MALLOC_DO( yylval->string = strdup(yytext+1), 
                                 {
-                                        TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s\n", yytext, strerror(errno));
+                                        TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno));
                                         return LEX_ERROR; /* trig an error in yacc parser */
                                 } );
@@ -96 +96 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        fd_log_debug("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
+                                        fd_log_debug("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? */
@@ -113 +113 @@
         /* Unrecognized sequence, if it did not match any previous pattern */
 [^[:space:]\":=+;\n]+   { 
-                                fd_log_debug("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
+                                fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }

extensions/rt_ereg/rtereg_conf.y

@@ -68 +68 @@
         if (rtereg_confin == NULL) {
                 ret = errno;
-                fd_log_debug("Unable to open extension configuration file %s for reading: %s\n", conffile, strerror(ret));
+                fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret));
                 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file.");
                 return ret;
@@ -96 +96 @@
         
         if (ploc->first_line != ploc->last_line)
-                fd_log_debug("%s:%d.%d-%d.%d : %s\n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
+                fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
         else if (ploc->first_column != ploc->last_column)
-                fd_log_debug("%s:%d.%d-%d : %s\n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);
+                fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);
         else
-                fd_log_debug("%s:%d.%d : %s\n", conffile, ploc->first_line, ploc->first_column, s);
+                fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s);
 }