Changeset 974:2091bf698fb1 in freeDiameter for extensions/dict_legacy_xml

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

Files:

• dict_lxml.l (modified) (2 diffs)
• dict_lxml.y (modified) (2 diffs)
• dict_lxml_xml.c (modified) (9 diffs)

extensions/dict_legacy_xml/dict_lxml.l

@@ -80 +80 @@
                                 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 */
                                 } );
@@ -92 +92 @@
         /* 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/dict_legacy_xml/dict_lxml.y

@@ -72 +72 @@
         if (dict_lxmlin == 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;
@@ -100 +100 @@
         
         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/dict_legacy_xml/dict_lxml_xml.c

@@ -123 +123 @@
 
 static void dump_vendor(struct t_vend * v) {
-        fd_log_debug(" Vendor %d:'%s'\n", v->id, (char *)v->name);
+        fd_log_debug(" Vendor %d:'%s'", v->id, (char *)v->name);
 }
 
@@ -175 +175 @@
         if (r->max != -1)
                 fd_log_debug("M:%d ", r->max);
-        fd_log_debug("%s\n", (char *)r->avpname);
+        fd_log_debug("%s", (char *)r->avpname);
 }
 
@@ -241 +241 @@
 static void dump_cmd(struct t_cmd * c) {
         struct fd_list * li;
-        fd_log_debug("  Command %d %s: %s\n", c->code, 
+        fd_log_debug("  Command %d %s: %s", c->code, 
                 c->fmask ? ( c->flags ? "[P=1]" : "[P=0]") : "", c->name);
         for (li = c->reqrules_fixed.next; li != &c->reqrules_fixed; li = li->next)
@@ -325 +325 @@
 
 static void dump_type(struct t_typedefn * t) {
-        fd_log_debug("  Type %s", (char *)t->name);
-        if (t->parent_name)
-                fd_log_debug("(parent: %s)", (char *)t->parent_name);
-        fd_log_debug("\n");
+        fd_log_debug("  Type %s%s%s%s", (char *)t->name,
+                     t->parent_name ? "(parent: " : "", 
+                     t->parent_name ? (char *)t->parent_name : "", 
+                     t->parent_name ? ")" : "");
 }
 
@@ -361 +361 @@
 
 static void dump_avptype(struct t_avptype * t) {
-        fd_log_debug("    data type: %s\n", t->type_name);
+        fd_log_debug("    data type: %s", t->type_name);
 }
 
@@ -398 +398 @@
 
 static void dump_enum(struct t_enum * e) {
-        fd_log_debug("    Value: %d == %s\n", e->code, e->name);
+        fd_log_debug("    Value: %d == %s", e->code, e->name);
 }       
 
@@ -469 +469 @@
 static void dump_avp(struct t_avp * a) {
         struct fd_list * li;
-        fd_log_debug("  AVP %d %s%s: %s\n", a->code, 
+        fd_log_debug("  AVP %d %s%s: %s", a->code, 
                 a->fmask & AVP_FLAG_MANDATORY ? ( a->flags & AVP_FLAG_MANDATORY ? "[M=1]" : "[M=0]") : "", 
                 a->fmask & AVP_FLAG_VENDOR ? ( a->flags & AVP_FLAG_VENDOR ? "[V=1]" : "[V=0]") : "", 
                 a->name);
         if (a->fmask & AVP_FLAG_VENDOR)
-                fd_log_debug("    vendor: %d\n", a->vendor);
+                fd_log_debug("    vendor: %d", a->vendor);
         for (li = a->type.next; li != &a->type; li = li->next)
                 dump_avptype((struct t_avptype *)li);
@@ -561 +561 @@
 static void dump_appl(struct t_appl * a) {
         struct fd_list * li;
-        fd_log_debug(" Application %d: %s\n", a->id, a->name);
+        fd_log_debug(" Application %d: %s", a->id, a->name);
         for (li = a->commands.next; li != &a->commands; li = li->next)
                 dump_cmd((struct t_cmd *)li);
@@ -1021 +1021 @@
                 TRACE_DEBUG(INFO, "Error encountered while parsing tag of:");
                 if (data->cur_app)
-                        fd_log_debug("  Application: '%s'\n", data->cur_app->name);
+                        fd_log_debug("  Application: '%s'", data->cur_app->name);
                 if (data->cur_cmd)
-                        fd_log_debug("  Command    : '%s'\n", data->cur_cmd->name);
+                        fd_log_debug("  Command    : '%s'", data->cur_cmd->name);
                 if (data->cur_avp)
-                        fd_log_debug("  AVP        : '%s'\n", data->cur_avp->name);
+                        fd_log_debug("  AVP        : '%s'", data->cur_avp->name);
         }
         return;