Changeset 974:2091bf698fb1 in freeDiameter for libfdcore/extensions.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:

• libfdcore/extensions.c (modified) (6 diffs)

libfdcore/extensions.c

@@ -82 +82 @@
         struct fd_list * li;
         
-        fd_log_debug("Dumping extensions list :\n");
+        fd_log_debug("Dumping extensions list :");
         
         for (li = ext_list.next; li != &ext_list; li = li->next)
         {
                 struct fd_ext_info * ext = (struct fd_ext_info *)li;
-                fd_log_debug(" - '%s'[%s] is %sloaded\n", ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not ");
+                fd_log_debug(" - '%s'[%s] is %sloaded", ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not ");
         }
 }
@@ -126 +126 @@
                 if (li == &ext->chain) {
                         /* the dependency was not found */
-                        TRACE_DEBUG(NONE, "Error: extension [%s] depends on [%s] which was not loaded first.\nPlease fix your configuration file.",
+                        TRACE_DEBUG(NONE, "Error: extension [%s] depends on [%s] which was not loaded first. Please fix your configuration file.",
                                 ext->ext_name, ext->depends[i]);
                         return ESRCH;
@@ -162 +162 @@
                 if (ext->handler == NULL) {
                         /* An error occured */
-                        TRACE_DEBUG( NONE, "Loading of extension %s failed:\n %s", ext->filename, dlerror());
+                        TRACE_DEBUG( NONE, "Loading of extension %s failed: %s", ext->filename, dlerror());
                         #ifdef DEBUG
                         ext->handler = dlopen(ext->filename, RTLD_LAZY | RTLD_GLOBAL);
                         if (ext->handler) {
                                 if (!check_dependencies(ext)) {
-                                        TRACE_DEBUG( NONE, "In addition, all declared dependencies are satisfied (Internal Error!)\n");
+                                        TRACE_DEBUG( NONE, "In addition, all declared dependencies are satisfied (Internal Error!)");
                                 }
                         }
@@ -182 +182 @@
                 if (fd_ext_init == NULL) {
                         /* An error occured */
-                        TRACE_DEBUG( NONE, "Unable to resolve symbol 'fd_ext_init' for extension %s:\n %s\n", ext->filename, dlerror());
+                        TRACE_DEBUG( NONE, "Unable to resolve symbol 'fd_ext_init' for extension %s: %s", ext->filename, dlerror());
                         return EINVAL;
                 }
@@ -201 +201 @@
                 if (ret != 0) {
                         /* The extension was unable to load cleanly */
-                        TRACE_DEBUG( NONE, "Extension %s returned an error during initialization: %s\n", ext->filename, strerror(ret));
+                        TRACE_DEBUG( NONE, "Extension %s returned an error during initialization: %s", ext->filename, strerror(ret));
                         return ret;
                 }
@@ -239 +239 @@
                         TRACE_DEBUG (FULL, "Unloading %s", ext->ext_name ?: ext->filename);
                         if ( dlclose(ext->handler) != 0 ) {
-                                TRACE_DEBUG (INFO, "Unloading [%s] failed : %s\n", ext->ext_name ?: ext->filename, dlerror());
+                                TRACE_DEBUG (INFO, "Unloading [%s] failed : %s", ext->ext_name ?: ext->filename, dlerror());
                         }
                 }