Changeset 974:2091bf698fb1 in freeDiameter for extensions/rt_default

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_default

Files:

• rtd_conf.l (modified) (4 diffs)
• rtd_conf.y (modified) (2 diffs)
• rtd_rules.c (modified) (5 diffs)

extensions/rt_default/rtd_conf.l

@@ -82 +82 @@
                                 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? */
@@ -107 +107 @@
                                 CHECK_MALLOC_DO( yylval->string = strdup(yytext+2), 
                                 {
-                                        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 */
                                 } );
@@ -119 +119 @@
                                 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 */
                                 } );
@@ -140 +140 @@
         /* 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_default/rtd_conf.y

@@ -71 +71 @@
         if (rtd_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;
@@ -99 +99 @@
         
         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);
 }
 

extensions/rt_default/rtd_rules.c

@@ -158 +158 @@
 static void dump_rule(int indent, struct rule * rule)
 {
-        fd_log_debug("%*s%s%s%s += %d\n",
+        fd_log_debug("%*s%s%s%s += %d",
                 indent, "",
                 rule->md.is_regex ? "[" : "'",
@@ -168 +168 @@
 {
         int i;
-        fd_log_debug("%*s%s%s%s :\n",
+        fd_log_debug("%*s%s%s%s :",
                 indent, "",
                 target->md.is_regex ? "[" : "'",
@@ -176 +176 @@
                 if (! FD_IS_LIST_EMPTY(&target->rules[i])) {
                         struct fd_list * li;
-                        fd_log_debug("%*s  rules[%d]:\n",
+                        fd_log_debug("%*s  rules[%d]:",
                                 indent, "", i);
                         for (li = target->rules[i].next; li != &target->rules[i]; li = li->next) {
@@ -594 +594 @@
 {
         int i;
-        fd_log_debug("[rt_default] Dumping rules repository...\n");
+        fd_log_debug("[rt_default] Dumping rules repository...");
         for (i = 0; i < RTD_TAR_MAX; i++) {
                 if (!FD_IS_LIST_EMPTY( &TARGETS[i] )) {
                         struct fd_list * li;
-                        fd_log_debug("  Targets list %d:\n", i);
+                        fd_log_debug("  Targets list %d:", i);
                         for (li = TARGETS[i].next; li != &TARGETS[i]; li = li->next) {
                                 dump_target(4, (struct target *)li);
@@ -605 +605 @@
         }
         
-        fd_log_debug("[rt_default] End of dump\n");
-}
+        fd_log_debug("[rt_default] End of dump");
+}