From 51650a6dfcc0abc330200caf1ea89fcb6b8dce8b Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 22 Mar 2023 12:57:15 +0100 Subject: ipcpd: Use consistent function naming For instance ipcp_udp_* vs eth_ipcp_*. Now all functions are _ipcp_*. Als cleans up some minor things. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/ipcpd/eth/eth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ipcpd/eth') diff --git a/src/ipcpd/eth/eth.c b/src/ipcpd/eth/eth.c index 6d9d78ba..15082ee3 100644 --- a/src/ipcpd/eth/eth.c +++ b/src/ipcpd/eth/eth.c @@ -1829,9 +1829,6 @@ int main(int argc, { int i; - if (ipcp_init(argc, argv, ð_ops, THIS_TYPE) < 0) - goto fail_init; - if (eth_data_init() < 0) { #if defined(BUILD_ETH_DIX) log_err("Failed to init eth-llc data."); @@ -1841,6 +1838,9 @@ int main(int argc, goto fail_data_init; } + if (ipcp_init(argc, argv, ð_ops, THIS_TYPE) < 0) + goto fail_init; + if (ipcp_start() < 0) { log_err("Failed to start IPCP."); goto fail_start; @@ -1878,9 +1878,9 @@ int main(int argc, exit(EXIT_SUCCESS); fail_start: - eth_data_fini(); - fail_data_init: ipcp_fini(); fail_init: + eth_data_fini(); + fail_data_init: exit(EXIT_FAILURE); } -- cgit v1.2.3