Clang warning fixes part 2 of 2.

diff --git a/src/listener.c b/src/listener.c
index d1351f56fd10c6f2d64b1086da624576b80f0c4f..b5fe775f1cdc36c37ebdbed5c8ccbade268c7c7f 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -231,7 +231,7 @@ inetport(struct Listener *listener)
                return 0;
        }
 
-       if((ret = rb_listen(F, RATBOX_SOMAXCONN)))
+       if(rb_listen(F, RATBOX_SOMAXCONN))
        {
                ilog_error("listen()");
                rb_close(F);

diff --git a/src/newconf.c b/src/newconf.c
index 761e5184ccbd31c9da022ac260c28c6c17b00f96..597dedb88d327fe8d3c21c2dfbf1a9f5af815912 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2020,7 +2020,7 @@ add_conf_item(const char *topconf, const char *name, int type, void (*func) (voi
        if((tc = find_top_conf(topconf)) == NULL)
                return -1;
 
-       if((cf = find_conf_item(tc, name)) != NULL)
+       if(find_conf_item(tc, name))
                return -1;
 
        cf = rb_malloc(sizeof(struct ConfEntry));

diff --git a/src/s_conf.c b/src/s_conf.c
index e09b41fd475fe46fe6f08ddebe7bfdda4a0cf302..bbe7293856f7dc56b13baf5f85d31b73fd24a09f 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -1768,7 +1768,7 @@ conf_fgets(char *lbuf, int max_size, FILE * fb)
 {
        char *buff;
 
-       if((buff = fgets(lbuf, max_size, fb)) == NULL)
+       if(fgets(lbuf, max_size, fb) == NULL)
                return (0);
 
        return (strlen(lbuf));

diff --git a/ssld/ssld.c b/ssld/ssld.c
index a6c6b5f9399ea2331b98314bc0313f6cbd86b25d..9870b70e119e845f4a371657f55b008a58bdff71 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -575,7 +575,7 @@ static void
 conn_mod_read_cb(rb_fde_t *fd, void *data)
 {
        conn_t *conn = data;
-       const char *err = remote_closed;
+       const char *err;
        int length;
        if(conn == NULL)
                return;