summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2020-05-02 11:47:29 +0200
committerSander Vrijders <sander@ouroboros.rocks>2020-05-02 11:52:54 +0200
commit65054fafc577cd326832fb4f673ecadd93c778e2 (patch)
tree5460ee498c0518fadf903745865812628466db41
parentae995c0f88e56680f5b8e18aa51ed6bee8776c6b (diff)
downloadouroboros-0.17.4.tar.gz
ouroboros-0.17.4.zip
ipcpd: Remove some unused variables0.17.4
The compiler spotted some variables that weren't really used. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/ipcpd/local/main.c3
-rw-r--r--src/tools/irm/irm_utils.c2
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;