Changeset 983:ab99bc1d5492 in freeDiameter for libfdcore

Timestamp:

Mar 17, 2013, 12:05:37 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Remove some additional printf

Location:

libfdcore

Files:

• config.c (modified) (4 diffs)
• core.c (modified) (2 diffs)

libfdcore/config.c

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

libfdcore/core.c

@@ -194 +194 @@
         CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL );
         if ( ! gnutls_check_version(GNUTLS_VERSION) ) {
-                fprintf(stderr, "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 "'\n", gnutls_check_version(NULL));
                 return EINVAL;
         } else {
@@ -317 +317 @@
                 ret = pthread_join(core_runner, &th_ret);
                 if (ret != 0) {
-                        fprintf(stderr, "Unable to wait for main framework thread termination: %s\n", strerror(ret));
+                        TRACE_ERROR( "Unable to wait for main framework thread termination: %s\n", strerror(ret));
                         return ret;
                 }