Changeset 974:2091bf698fb1 in freeDiameter for extensions/app_redirect

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/app_redirect

Files:

• ard_conf.l (modified) (4 diffs)
• ard_conf.y (modified) (1 diff)
• ard_rules.c (modified) (1 diff)

extensions/app_redirect/ard_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 TOK_LEX_ERROR; /* trig an error in yacc parser */
                                         /* Maybe we could REJECT instead of failing here? */
@@ -94 +94 @@
                                 CHECK_MALLOC_DO( yylval->tstring.str = 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 TOK_LEX_ERROR; /* trig an error in yacc parser */
                                 } );
@@ -107 +107 @@
                                 CHECK_MALLOC_DO( yylval->tstring.str = 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 TOK_LEX_ERROR; /* trig an error in yacc parser */
                                 } );
@@ -134 +134 @@
         /* 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 TOK_LEX_ERROR; 
                         }

extensions/app_redirect/ard_conf.y

@@ -76 +76 @@
                 return;
                 
-        fd_log_debug("app_redirect: configuration dump:\n");
-        fd_log_debug("   default_redirect_cache_time : %u sec\n", ard_conf->default_rct);
+        fd_log_debug("app_redirect: configuration dump:");
+        fd_log_debug("   default_redirect_cache_time : %u sec", ard_conf->default_rct);
         for (li = ard_conf->rules.next; li != &ard_conf->rules; li = li->next) {
                 ard_rule_dump(li->o);
         }
-        fd_log_debug("app_redirect: end of configuration dump\n");
+        fd_log_debug("app_redirect: end of configuration dump");
 }
 

extensions/app_redirect/ard_rules.c

@@ -54 +54 @@
 {
         struct fd_list * li;
-        fd_log_debug("   rule @%p: %s, %us\n", r, redir_type_str[r->type], r->rct);
+        fd_log_debug("   rule @%p: %s, %us", r, redir_type_str[r->type], r->rct);
         for (li = r->criteria.next; li != &r->criteria; li = li->next) {
                 struct ard_criteria * c = li->o;
-                fd_log_debug("      Criteria: ");
                 switch (c->type) {
                         case FROM_ID:
-                                fd_log_debug("received from peer %s'%s'", c->is_regex?"REGEX":"", c->s);
+                                fd_log_debug("      Criteria: received from peer %s'%s'", c->is_regex?"REGEX":"", c->s);
                                 break;
                         case FROM_REALM:
-                                fd_log_debug("received from realm %s'%s'", c->is_regex?"REGEX":"", c->s);
+                                fd_log_debug("      Criteria: received from realm %s'%s'", c->is_regex?"REGEX":"", c->s);
                                 break;
                         case APP_ID:
-                                fd_log_debug("application id is %u", c->i);
+                                fd_log_debug("      Criteria: application id is %u", c->i);
                                 break;
                         case AVP_INT:
-                                fd_log_debug("contains '%s' AVP with value '%d'", c->avp_info.avp_name, c->i);
+                                fd_log_debug("      Criteria: contains '%s' AVP with value '%d'", c->avp_info.avp_name, c->i);
                                 break;
                         case AVP_STR:
-                                fd_log_debug("contains '%s' AVP with value %s'%s'", c->avp_info.avp_name, c->is_regex?"REGEX":"", c->s);
+                                fd_log_debug("      Criteria: contains '%s' AVP with value %s'%s'", c->avp_info.avp_name, c->is_regex?"REGEX":"", c->s);
                                 break;
                 
                         default:
-                                fd_log_debug("invalid (%d)!", c->type);
-                }
-                fd_log_debug("\n");
+                                fd_log_debug("      Criteria: invalid (%d)!", c->type);
+                }
         }
         for (li = r->targets.next; li != &r->targets; li = li->next) {
                 struct ard_target * t = li->o;
-                fd_log_debug("      Redirect to: '%s'\n", t->s);
+                fd_log_debug("      Redirect to: '%s'", t->s);
         }
 }