From 65054fafc577cd326832fb4f673ecadd93c778e2 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 2 May 2020 11:47:29 +0200 Subject: ipcpd: Remove some unused variables The compiler spotted some variables that weren't really used. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- CMakeLists.txt | 2 +- src/ipcpd/local/main.c | 3 +-- src/tools/irm/irm_utils.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d09ed1c..535a0540 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(GNUInstallDirs) set(PACKAGE_VERSION_MAJOR 0) set(PACKAGE_VERSION_MINOR 17) -set(PACKAGE_VERSION_PATCH 3) +set(PACKAGE_VERSION_PATCH 4) set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(PACKAGE_DESCRIPTION "The Ouroboros prototype") diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c index a2e20017..fcf51626 100644 --- a/src/ipcpd/local/main.c +++ b/src/ipcpd/local/main.c @@ -250,7 +250,6 @@ static int ipcp_local_flow_alloc_resp(int fd, struct timespec ts = {0, ALLOC_TIMEOUT * MILLION}; struct timespec abstime; int out_fd = -1; - int ret = -1; clock_gettime(PTHREAD_COND_CLOCK, &abstime); @@ -293,7 +292,7 @@ static int ipcp_local_flow_alloc_resp(int fd, fset_add(local_data.flows, fd); - if ((ret = ipcp_flow_alloc_reply(out_fd, response, data, len)) < 0) + if (ipcp_flow_alloc_reply(out_fd, response, data, len) < 0) return -1; log_info("Flow allocation completed, fds (%d, %d).", out_fd, fd); diff --git a/src/tools/irm/irm_utils.c b/src/tools/irm/irm_utils.c index 0620e374..d3bdf3d6 100644 --- a/src/tools/irm/irm_utils.c +++ b/src/tools/irm/irm_utils.c @@ -109,7 +109,7 @@ int wildcard_match(const char * pattern, return 0; /* General case, use recursion. */ - while ((c = *string) != '\0') { + while (*string != '\0') { if (!wildcard_match(pattern, string)) return 0; ++string; -- cgit v1.2.3