Changes in libfdcore/config.c [947:cce5d4bace82:897:d8d0772586ad] in freeDiameter

File:

• libfdcore/config.c (modified) (3 diffs)

libfdcore/config.c

@@ -230 +230 @@
 {
         extern FILE * fddin;
-        const char * orig = NULL;
+        char * orig = NULL;
         
         /* Attempt to find the configuration file */
@@ -238 +238 @@
         fddin = fopen(fd_g_config->cnf_file, "r");
         if ((fddin == NULL) && (*fd_g_config->cnf_file != '/')) {
-                char * new_cnf = NULL;
                 /* We got a relative path, attempt to add the default directory prefix */
                 orig = fd_g_config->cnf_file;
-                CHECK_MALLOC( new_cnf = malloc(strlen(orig) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */
-                sprintf( new_cnf, DEFAULT_CONF_PATH "/%s", orig );
-                fd_g_config->cnf_file = new_cnf;
+                CHECK_MALLOC( fd_g_config->cnf_file = malloc(strlen(orig) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */
+                sprintf( fd_g_config->cnf_file, DEFAULT_CONF_PATH "/%s", orig );
                 fddin = fopen(fd_g_config->cnf_file, "r");
         }
         if (fddin == NULL) {
                 int ret = errno;
-                TRACE_DEBUG_ERROR("Unable to open configuration file for reading; tried the following locations: %s%s%s; Error: %s\n",
-                                  orig ?: "", orig? " and " : "", fd_g_config->cnf_file, strerror(ret));
+                if (orig) {
+                        fprintf(stderr, "Unable to open configuration file for reading\n"
+                                        "Tried the following locations:\n"
+                                        " - %s\n"
+                                        " - %s\n"
+                                        "Error: %s\n", orig, fd_g_config->cnf_file, strerror(ret));
+                } else {
+                        fprintf(stderr, "Unable to open '%s' for reading: %s\n", fd_g_config->cnf_file, strerror(ret));
+                }
                 return ret;
         }
@@ -347 +352 @@
                                 fd_list_unlink(&ep->chain);
                                 if (TRACE_BOOL(INFO)) {
-                                        char buf[1024];
-                                        sSA_DUMP_NODE( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST );
-                                        fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : %s\n", buf);
+                                        fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : ");
+                                        sSA_DUMP_NODE( &ep->sa, NI_NUMERICHOST );
+                                        fd_log_debug("\n");
                                 }
                                 free(ep);