Changeset 994:1e1d6f94cd94 in freeDiameter

Timestamp:

Mar 18, 2013, 9:22:07 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Remove more newlines.

Files:

• include/freeDiameter/extension.h (modified) (2 diffs)
• libfdcore/config.c (modified) (4 diffs)
• libfdcore/core.c (modified) (2 diffs)
• tests/tests.h (modified) (3 diffs)

include/freeDiameter/extension.h

@@ -52 +52 @@
         if ((major != FD_PROJECT_VERSION_MAJOR)                                         \
                 || (minor != FD_PROJECT_VERSION_MINOR)) {                               \
-                TRACE_ERROR("This extension (" _name ") was compiled for a different version of freeDiameter.\n");      \
+                TRACE_ERROR("This extension (" _name ") was compiled for a different version of freeDiameter.");        \
                 TRACE_DEBUG(INFO, "daemon %d.%d != ext %d.%d",                          \
                         major, minor,                                                   \
@@ -59 +59 @@
         }                                                                               \
         if (extension_loaded) {                                                         \
-                TRACE_ERROR("Extension (" _name ") cannot be loaded twice!\n");         \
+                TRACE_ERROR("Extension (" _name ") cannot be loaded twice!");           \
                 return ENOTSUP;                                                         \
         }                                                                               \

libfdcore/config.c

@@ -262 +262 @@
         /* Check that TLS private key was given */
         if (! fd_g_config->cnf_sec_data.key_file) {
-                TRACE_ERROR( "Missing private key configuration for TLS. Please provide the TLS_cred configuration directive.\n");
+                TRACE_ERROR( "Missing private key configuration for TLS. Please provide the TLS_cred configuration directive.");
                 return EINVAL;
         }
@@ -295 +295 @@
                 ret = getaddrinfo(buf, NULL, &hints, &info);
                 if (ret != 0) {
-                        TRACE_ERROR( "Error resolving local FQDN :\n"
-                                        " '%s' : %s\n"
-                                        "Please provide Identity in configuration file.\n",
+                        TRACE_ERROR( "Error resolving local FQDN : '%s' : %s"
+                                        ". Please provide Identity in configuration file.",
                                         buf, gai_strerror(ret));
                         return EINVAL;
@@ -315 +314 @@
                 start = strchr(fd_g_config->cnf_diamid, '.');
                 if ((start == NULL) || (start[1] == '\0')) {
-                        TRACE_ERROR( "Unable to extract realm from the Identity '%s'.\n"
-                                        "Please fix your Identity setting or provide Realm.\n",
+                        TRACE_ERROR( "Unable to extract realm from the Identity '%s'."
+                                        " Please fix your Identity setting or provide Realm.",
                                         fd_g_config->cnf_diamid);
                         return EINVAL;
@@ -329 +328 @@
         /* Validate some flags */
         if (fd_g_config->cnf_flags.no_ip4 && fd_g_config->cnf_flags.no_ip6) {
-                TRACE_ERROR( "IP and IPv6 cannot be disabled at the same time.\n");
+                TRACE_ERROR( "IP and IPv6 cannot be disabled at the same time.");
                 return EINVAL;
         }
         if (fd_g_config->cnf_flags.no_tcp && fd_g_config->cnf_flags.no_sctp) {
-                TRACE_ERROR( "TCP and SCTP cannot be disabled at the same time.\n");
+                TRACE_ERROR( "TCP and SCTP cannot be disabled at the same time.");
                 return EINVAL;
         }

libfdcore/core.c

@@ -194 +194 @@
         CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL );
         if ( ! gnutls_check_version(GNUTLS_VERSION) ) {
-                TRACE_ERROR( "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'\n", gnutls_check_version(NULL));
+                TRACE_ERROR( "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'", gnutls_check_version(NULL));
                 return EINVAL;
         } else {
@@ -317 +317 @@
                 ret = pthread_join(core_runner, &th_ret);
                 if (ret != 0) {
-                        TRACE_ERROR( "Unable to wait for main framework thread termination: %s\n", strerror(ret));
+                        TRACE_ERROR( "Unable to wait for main framework thread termination: %s", strerror(ret));
                         return ret;
                 }

tests/tests.h

@@ -75 +75 @@
 /* Define the macro to pass a test */
 #define PASSTEST( ){                                    \
-        TRACE_NOTICE("Test %s passed\n", __FILE__);     \
+        TRACE_NOTICE("Test %s passed", __FILE__);       \
         TRACE_DEBUG(INFO, "Test passed");               \
         (void)fd_core_shutdown();                       \
@@ -92 +92 @@
                 TRACE_ERROR(                            \
                         "%s:%-4d: CHECK( " #_assert " == "\
-                                #_val " )\n",           \
+                                #_val " )",             \
                         __FILE__,                       \
                         __LINE__);                      \
@@ -98 +98 @@
         __typeof__ (_val) __ret = (_assert);            \
         if (__ret != (_val)) {                          \
-                FAILTEST( "%s:%d: CHECK FAILED : %s == %lx != %lx\n",   \
+                FAILTEST( "%s:%d: CHECK FAILED : %s == %lx != %lx",     \
                         __FILE__,                       \
                         __LINE__,                       \