Changeset 974:2091bf698fb1 in freeDiameter for extensions/acl_wl

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

Files:

• aw_conf.l (modified) (1 diff)
• aw_conf.y (modified) (2 diffs)
• aw_tree.c (modified) (8 diffs)

extensions/acl_wl/aw_conf.l

@@ -96 +96 @@
 <*>[[:alnum:]]+         |       /* This rule is only useful to print a complete token in error messages */
 <*>.                    {
-                                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; 
                         }

extensions/acl_wl/aw_conf.y

@@ -74 +74 @@
         if (aw_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;
@@ -102 +102 @@
         
         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/acl_wl/aw_tree.c

@@ -116 +116 @@
         
 #if 0
-        fd_log_debug("Parsed name %s as:\n", name);
+        fd_log_debug("Parsed name %s as:", name);
         for (i=0; i<=l; i++)
-                fd_log_debug("  str[%d] len: %d, v:%.*s\n", i, result->label[i].len, result->label[i].len, result->label[i].str);
+                fd_log_debug("  str[%d] len: %d, v:%.*s", i, result->label[i].len, result->label[i].len, result->label[i].str);
 #endif /* 0 */
         return 0;
@@ -179 +179 @@
         for (li = sub->next; li != sub; li = li->next) {
                 struct tree_item * ti = (struct tree_item *)li;
-                fd_log_debug("%*s%s", indent * 2, "", ti->str?:"*");
+                char buf[1024];
+                snprintf(buf, sizeof(buf), "%*s%s", indent * 2, "", ti->str?:"*");
                 if (ti->leaf)
-                        fd_log_debug(" (flag:%x)", ti->flags);
-                fd_log_debug("\n");
+                        snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), " (flag:%x)", ti->flags);
+                fd_log_debug("%s", buf);
                 tree_dump(&ti->children, indent + 1);
         }
@@ -190 +191 @@
 void aw_tree_dump(void)
 {
-        fd_log_debug("[acl_wl] tree dump:\n(root)\n");
+        fd_log_debug("[acl_wl] tree dump:");
+        fd_log_debug("(root)");
         tree_dump(&tree_root, 1);
-        fd_log_debug("[acl_wl] end of dump\n");
+        fd_log_debug("[acl_wl] end of dump");
 }
 
@@ -208 +210 @@
         CHECK_FCT_DO( parse_name(name, &sn), 
                 { 
-                        fd_log_debug("The name '%s' contains too many labels, try a generic (*) or recompile with bigger AW_TREE_MAXDEPTH value (cur: %d)\n", name, AW_TREE_MAXDEPTH); 
+                        fd_log_debug("The name '%s' contains too many labels, try a generic (*) or recompile with bigger AW_TREE_MAXDEPTH value (cur: %d)", name, AW_TREE_MAXDEPTH); 
                         return EINVAL; 
                 } );
@@ -229 +231 @@
                 ti = (struct tree_item *)(senti->next);
                 if (ti->str == NULL) {
-                        fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label %d, ignoring.\n", name, lbl + 1);
+                        fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label %d, ignoring.", name, lbl + 1);
                         return 0;
                 }
@@ -275 +277 @@
         if (sn.label[0].str[0] == '*') {
                 if (!FD_IS_LIST_EMPTY(senti)) {
-                        fd_log_debug("[acl_wl] Warning: entry '%s' overwrites previous more detailed entries, these are deleted.\n", name);
+                        fd_log_debug("[acl_wl] Warning: entry '%s' overwrites previous more detailed entries, these are deleted.", name);
                         delete_tree(senti);
                 }
@@ -286 +288 @@
                         ti = (struct tree_item *)(senti->next);
                         if (ti->str == NULL) {
-                                fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label 1, ignoring.\n", name);
+                                fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label 1, ignoring.", name);
                                 return 0;
                         }
@@ -310 +312 @@
                                 /* We already had this label */
                                 if (ti->leaf) {
-                                        fd_log_debug("[acl_wl] Warning: entry '%s' is duplicated, merging the flags.\n", name);
+                                        fd_log_debug("[acl_wl] Warning: entry '%s' is duplicated, merging the flags.", name);
                                         ti->flags |= flags;
                                         return 0;