summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/shim-eth-llc/CMakeLists.txt4
-rw-r--r--src/ipcpd/shim-udp/CMakeLists.txt8
-rw-r--r--src/irmd/main.c4
-rw-r--r--src/lib/dev.c8
4 files changed, 12 insertions, 12 deletions
diff --git a/src/ipcpd/shim-eth-llc/CMakeLists.txt b/src/ipcpd/shim-eth-llc/CMakeLists.txt
index b3abc052..08f50c04 100644
--- a/src/ipcpd/shim-eth-llc/CMakeLists.txt
+++ b/src/ipcpd/shim-eth-llc/CMakeLists.txt
@@ -33,9 +33,9 @@ target_link_libraries(ipcpd-shim-eth-llc LINK_PUBLIC ouroboros
${PROTOBUF_C_LIBRARY})
if (${NETMAP_C_INCLUDE_DIR} STREQUAL "NETMAP_C_INCLUDE_DIR-NOTFOUND")
- message("-- Could not find netmap. Install for better performance.")
+ message(STATUS "Could not find netmap. Install for better performance.")
else ()
- message("-- Found netmap headers in ${NETMAP_C_INCLUDE_DIR}")
+ message(STATUS "Found netmap headers in ${NETMAP_C_INCLUDE_DIR}")
include_directories(${NETMAP_C_INCLUDE_DIR})
add_compile_flags(ipcpd-shim-eth-llc -DHAVE_NETMAP)
test_and_set_c_compiler_flag_global(-std=c99)
diff --git a/src/ipcpd/shim-udp/CMakeLists.txt b/src/ipcpd/shim-udp/CMakeLists.txt
index 2560f242..3ff8dd5f 100644
--- a/src/ipcpd/shim-udp/CMakeLists.txt
+++ b/src/ipcpd/shim-udp/CMakeLists.txt
@@ -42,12 +42,12 @@ find_program(NSLOOKUP_EXECUTABLE
include(AddCompileFlags)
if (${NSUPDATE_EXECUTABLE} STREQUAL "NSUPDATE_EXECUTABLE-NOTFOUND")
- message("-- Could not find nsupdate. Disabling DDNS functionality.")
+ message(STATUS "Could not find nsupdate. Disabling DDNS functionality.")
elseif (${NSLOOKUP_EXECUTABLE} STREQUAL "NSLOOKUP_EXECUTABLE-NOTFOUND")
- message("-- Could not find nslookup. Disabling DNS lookups.")
+ message(STATUS "Could not find nslookup. Disabling DNS lookups.")
else ()
- message("-- Found nsupdate: ${NSUPDATE_EXECUTABLE}")
- message("-- Found nslookup: ${NSLOOKUP_EXECUTABLE}")
+ message(STATUS "Found nsupdate: ${NSUPDATE_EXECUTABLE}")
+ message(STATUS "Found nslookup: ${NSLOOKUP_EXECUTABLE}")
add_compile_flags(ipcpd-shim-udp -DCONFIG_OUROBOROS_ENABLE_DNS)
endif ()
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 125061fb..d24c0ba1 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -2171,14 +2171,14 @@ int main(int argc,
{
struct sigaction sig_act;
sigset_t sigset;
+ bool use_stdout = false;
+
sigemptyset(&sigset);
sigaddset(&sigset, SIGINT);
sigaddset(&sigset, SIGQUIT);
sigaddset(&sigset, SIGHUP);
sigaddset(&sigset, SIGPIPE);
- bool use_stdout = false;
-
if (geteuid() != 0) {
log_err("IPC Resource Manager must be run as root.");
exit(EXIT_FAILURE);
diff --git a/src/lib/dev.c b/src/lib/dev.c
index a4707dc3..d68fb471 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -268,7 +268,7 @@ int ap_init(const char * ap_name)
if (ai.fqset == NULL) {
bmp_destroy(ai.fqueues);
bmp_destroy(ai.fds);
- return -1;
+ return -ENOMEM;
}
ai.rdrb = shm_rdrbuff_open();
@@ -285,7 +285,7 @@ int ap_init(const char * ap_name)
shm_flow_set_destroy(ai.fqset);
bmp_destroy(ai.fqueues);
bmp_destroy(ai.fds);
- return -1;
+ return -ENOMEM;
}
for (i = 0; i < AP_MAX_FLOWS; ++i)
@@ -298,7 +298,7 @@ int ap_init(const char * ap_name)
shm_flow_set_destroy(ai.fqset);
bmp_destroy(ai.fqueues);
bmp_destroy(ai.fds);
- return -1;
+ return -ENOMEM;
}
if (ap_name != NULL) {
@@ -319,7 +319,7 @@ int ap_init(const char * ap_name)
shm_flow_set_destroy(ai.fqset);
bmp_destroy(ai.fqueues);
bmp_destroy(ai.fds);
- return -1;
+ return -EIRMD;
}
}