Changeset 974:2091bf698fb1 in freeDiameter for libfdproto/dictionary.c

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.

File:

• libfdproto/dictionary.c (modified) (7 diffs)

libfdproto/dictionary.c

@@ -315 +315 @@
                 {
                         if (obj) {
-                                TRACE_DEBUG(FULL, "Invalid object : %p\n"
+                                TRACE_DEBUG(FULL, "Invalid object : %p"
                                                   "     obj->objeyec : %x / %x\n"
                                                   "     obj->type    : %d\n"
@@ -1282 +1282 @@
                 for (i=0; i<NB_LISTS_PER_OBJ; i++) {
                         if ((obj->list[i].o == NULL) && (obj->list[i].next != &obj->list[i])) {
-                                fd_log_debug("%*s>%p: list[%d]:\n", indent, "", obj, i);
+                                fd_log_debug("%*s>%p: list[%d]:", indent, "", obj, i);
                                 dump_list(&obj->list[i], parents, depth - 1, indent + 2);
                         }
@@ -1291 +1291 @@
 void fd_dict_dump_object(struct dict_object * obj)
 {
-        fd_log_debug("Dictionary object %p dump:\n", obj);
+        fd_log_debug("Dictionary object %p dump:", obj);
         dump_object( obj, 1, 2, 2 );
 }
@@ -1304 +1304 @@
         CHECK_POSIX_DO(  pthread_rwlock_rdlock( &dict->dict_lock ), /* ignore */  );
         
-        fd_log_debug("######################################################\n");
-        fd_log_debug("###### Dumping vendors, AVPs and related rules #######\n");
+        fd_log_debug("######################################################");
+        fd_log_debug("###### Dumping vendors, AVPs and related rules #######");
         
         dump_object( &dict->dict_vendors, 0, 3, 0 );
@@ -1311 +1311 @@
                 dump_object( li->o, 0, 3, 0 );
         
-        fd_log_debug("######          Dumping applications           #######\n");
+        fd_log_debug("######          Dumping applications           #######");
 
         dump_object( &dict->dict_applications, 0, 1, 0 );
@@ -1317 +1317 @@
                 dump_object( li->o, 0, 1, 0 );
         
-        fd_log_debug("######             Dumping types               #######\n");
+        fd_log_debug("######             Dumping types               #######");
 
         dump_list( &dict->dict_types, 0, 2, 0 );
         
-        fd_log_debug("######      Dumping commands per name          #######\n");
+        fd_log_debug("######      Dumping commands per name          #######");
 
         dump_list( &dict->dict_cmd_name, 0, 2, 0 );
         
-        fd_log_debug("######   Dumping commands per code and flags   #######\n");
+        fd_log_debug("######   Dumping commands per code and flags   #######");
 
         dump_list( &dict->dict_cmd_code, 0, 0, 0 );
         
-        fd_log_debug("######             Statistics                  #######\n");
+        fd_log_debug("######             Statistics                  #######");
 
         for (i=1; i<=DICT_TYPE_MAX; i++)
-                fd_log_debug(" %5d objects of type %s\n", dict->dict_count[i], dict_obj_info[i].name);
-        
-        fd_log_debug("######################################################\n");
+                fd_log_debug(" %5d objects of type %s", dict->dict_count[i], dict_obj_info[i].name);
+        
+        fd_log_debug("######################################################");
         
         /* Free the rwlock */
@@ -1867 +1867 @@
                         TRACE_DEBUG(INFO, "An existing object with different non-key data was found: EEXIST");
                         if (TRACE_BOOL(INFO)) {
-                                fd_log_debug("New object to insert:\n");
+                                fd_log_debug("New object to insert:");
                                 dump_object(new, 0, 0, 3);
-                                fd_log_debug("Object already in dictionary:\n");                        
+                                fd_log_debug("Object already in dictionary:");                  
                                 dump_object(locref, 0, 0 , 3);
                         }