Merged in sandervrijders/ouroboros/be-ipcpd-logs (pull request #370)

ipcpd: Remove logging if not initialized yet

5 files changed, 1 insertions, 7 deletions

diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 42720867..24d8da46 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -306,10 +306,8 @@ int ipcp_init(int               argc,
         struct timeval tv = {(IPCP_ACCEPT_TIMEOUT / 1000),
                              (IPCP_ACCEPT_TIMEOUT % 1000) * 1000};
 
-        if (parse_args(argc, argv, &log)) {
-                log_err("Failed to parse arguments.");
+        if (parse_args(argc, argv, &log))
                 return -1;
-        }
 
         log_init(log);
 
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index ccbd6acb..8d770c94 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -352,7 +352,6 @@ int main(int    argc,
         sigaction(SIGPIPE, &sig_act, NULL);
 
         if (ipcp_init(argc, argv, THIS_TYPE, &local_ops) < 0) {
-                log_err("Failed to init IPCP.");
                 ipcp_create_r(getpid(), -1);
                 exit(EXIT_FAILURE);
         }
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 69f24fce..81912614 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -459,7 +459,6 @@ int main(int    argc,
         sigaction(SIGPIPE, &sig_act, NULL);
 
         if (ipcp_init(argc, argv, THIS_TYPE, &normal_ops) < 0) {
-                log_err("Failed to create instance.");
                 ipcp_create_r(getpid(), -1);
                 exit(EXIT_FAILURE);
         }
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index f96c6e8a..ca6008cf 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -1127,7 +1127,6 @@ int main(int    argc,
         sigaction(SIGPIPE, &sig_act, NULL);
 
         if (ipcp_init(argc, argv, THIS_TYPE, &eth_llc_ops) < 0) {
-                log_err("Failed to init IPCP.");
                 ipcp_create_r(getpid(), -1);
                 exit(EXIT_FAILURE);
         }
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 47628a3e..4d6fdc3b 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -1195,7 +1195,6 @@ int main(int    argc,
         sigaction(SIGPIPE, &sig_act, NULL);
 
         if (ipcp_init(argc, argv, THIS_TYPE, &udp_ops) < 0) {
-                log_err("Failed to init IPCP.");
                 ipcp_create_r(getpid(), -1);
                 exit(EXIT_FAILURE);
         }