summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/local/main.c3
-rw-r--r--src/tools/irm/irm_utils.c2
2 files changed, 2 insertions, 3 deletions
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;