prelude-manager/master: GCC Extra warnings fixes

commit 1c89b29e3d773bc5f91f46cc971130313368b384
Author: Yoann Vandoorselaere <[email protected]>
Date:   Tue Jan 19 15:43:48 2010 +0100

    GCC Extra warnings fixes


========================================

 plugins/reports/db/db.c       |    2 +-
 plugins/reports/smtp/smtp.c   |    8 ++++----
 src/idmef-message-scheduler.c |    3 ++-
 src/manager-options.c         |    2 +-
 src/sensor-server.c           |    4 ++--
 src/server-generic.c          |    2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

========================================

diff --git a/plugins/reports/db/db.c b/plugins/reports/db/db.c
index 76ea7e0..ea7a887 100644
--- a/plugins/reports/db/db.c
+++ b/plugins/reports/db/db.c
@@ -240,7 +240,7 @@ int db_LTX_manager_plugin_init(prelude_plugin_entry_t *pe, void *rootopt)
 
         ret = prelude_option_add(rootopt, &opt, hook, 0, "db", "Options for the libpreludedb plugin",
                                  PRELUDE_OPTION_ARGUMENT_OPTIONAL, db_activate, NULL);
-        if ( opt < 0 )
+        if ( ret < 0 )
                 return ret;
 
         prelude_plugin_set_activation_option(pe, opt, db_init);
diff --git a/plugins/reports/smtp/smtp.c b/plugins/reports/smtp/smtp.c
index 4bcb97b..8f87374 100644
--- a/plugins/reports/smtp/smtp.c
+++ b/plugins/reports/smtp/smtp.c
@@ -49,7 +49,7 @@
 
 
 #ifndef MIN
-# define MIN(x, y) ((x < y) ? (x) : (y))
+# define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #endif
 
 
@@ -152,7 +152,7 @@ static char *strip_return_constant(const char *str, char *buf, size_t size)
         if ( ! end )
                 return "invalid input string";
 
-        len = MIN(end - str, size - 1);
+        len = MIN((size_t) (end - str), size - 1);
         strncpy(buf, str, len);
         buf[len] = 0;
 
@@ -241,7 +241,7 @@ static int send_command_va(smtp_plugin_t *plugin, int expected, const char *fmt,
         ret = vsnprintf(wbuf, sizeof(wbuf), fmt, ap);
         va_end(ap);
 
-        if ( ret < 0 || ret >= sizeof(wbuf) ) {
+        if ( ret < 0 || (unsigned int) ret >= sizeof(wbuf) ) {
                 prelude_log(PRELUDE_LOG_WARN, "buffer not large enough (%u bytes needed).\n", ret);
                 return ret;
         }
@@ -410,7 +410,7 @@ static int send_correlation_alert_notice(smtp_plugin_t *plugin, int count)
         if ( ret < 0 || ret == sizeof(txt) )
                 return -1;
 
-        len = MIN(sizeof(pad) - 1, ret);
+        len = MIN(sizeof(pad) - 1, (size_t) ret);
         memset(pad, '*', len);
         pad[len] = 0;
 
diff --git a/src/idmef-message-scheduler.c b/src/idmef-message-scheduler.c
index cabdcc1..2ab1cd7 100644
--- a/src/idmef-message-scheduler.c
+++ b/src/idmef-message-scheduler.c
@@ -291,7 +291,8 @@ static size_t read_message_scheduled_from_pool(bufpool_t *pool, size_t count)
 
 static void read_message_scheduled(idmef_queue_t *queue)
 {
-        int ret, i = 0, j;
+        unsigned int j;
+        int ret, i = 0;
         prelude_msg_t *msg;
         size_t total, hlen, mlen, llen, proc;
         bufpool_t *btbl[] = { queue->high, queue->mid, queue->low };
diff --git a/src/manager-options.c b/src/manager-options.c
index 91c1e5b..f9abc5d 100644
--- a/src/manager-options.c
+++ b/src/manager-options.c
@@ -309,7 +309,7 @@ static char *const2char(const char *val)
 
 static int set_sched_priority(prelude_option_t *opt, const char *arg, prelude_string_t *err, void *context)
 {
-        int i;
+        unsigned int i;
         char *name, *prio, *value = const2char(arg);
         struct {
                 const char *name;
diff --git a/src/sensor-server.c b/src/sensor-server.c
index 7043d10..57e063c 100644
--- a/src/sensor-server.c
+++ b/src/sensor-server.c
@@ -182,7 +182,7 @@ static int get_msg_target_ident(sensor_fd_t *client, prelude_msg_t *msg,
                         break;
 
                 ret = (direction == PRELUDE_MSG_OPTION_REQUEST) ? hop - 1 : hop + 1;
-                if ( ret < 0 || ret >= (target_len / sizeof(uint64_t)) )
+                if ( ret < 0 || (size_t) ret >= (target_len / sizeof(uint64_t)) )
                         break;
 
                 ident = prelude_extract_uint64(&(*target_ptr)[ret]);
@@ -190,7 +190,7 @@ static int get_msg_target_ident(sensor_fd_t *client, prelude_msg_t *msg,
                         return prelude_error_verbose(PRELUDE_ERROR_GENERIC, "client attempt to mask source identifier");
 
                 hop = (direction == PRELUDE_MSG_OPTION_REQUEST) ? hop + 1 : hop - 1;
-                if ( ret < 0 || ret >= (target_len / sizeof(uint64_t)) )
+                if ( ret < 0 || (size_t) ret >= (target_len / sizeof(uint64_t)) )
                         break;
 
                 if ( hop == (target_len / sizeof(uint64_t)) ) {
diff --git a/src/server-generic.c b/src/server-generic.c
index faa602e..35cd28f 100644
--- a/src/server-generic.c
+++ b/src/server-generic.c
@@ -509,7 +509,7 @@ static void ev_trigger_cb(struct ev_loop *loop, struct ev_async *w, int revents)
 
 static int wait_connection(server_generic_t **server, size_t nserver)
 {
-        int i;
+        unsigned int i;
 
         ev_async_init(&ev_trigger, ev_trigger_cb);
         ev_async_start(manager_event_loop, &ev_trigger);
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog