[Cluster-devel] cluster/rgmanager/src/daemons clurmtabd.c main.c

[fabbione]

CVSROOT:        /cvs/cluster
Module name:    cluster
Changes by:     [EMAIL PROTECTED]       2007-09-19 09:54:19

Modified files:
        rgmanager/src/daemons: clurmtabd.c main.c 

Log message:
        Fix more warnings when building with -O2 and also fix 
get_rmtabd_loglevel
        to actually do what is supposed to.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/clurmtabd.c.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/main.c.diff?cvsroot=cluster&r1=1.43&r2=1.44

--- cluster/rgmanager/src/daemons/clurmtabd.c   2005/01/25 20:18:29     1.3
+++ cluster/rgmanager/src/daemons/clurmtabd.c   2007/09/19 09:54:19     1.4
@@ -73,7 +73,7 @@
 #if 0
 static inline int __get_int_param(char *str, int *val, int dflt);
 #endif
-static int get_rmtabd_loglevel(int *level);
+static int get_rmtabd_loglevel(void);
 static int get_rmtabd_pollinterval(int *interval);
 static void rmtabd_reconfigure(void);
 
@@ -378,7 +378,7 @@
  * Gets the loglevel of rmtabd
  */
 static int
-get_rmtabd_loglevel(int *level)
+get_rmtabd_loglevel(void)
 {
 #if 0
        return __get_int_param(LOGLEVEL_STR, level, LOG_DEFAULT);
@@ -412,7 +412,7 @@
 
        /* loglevel */
        old_level = clu_get_loglevel();
-       get_rmtabd_loglevel(&level);
+       level = get_rmtabd_loglevel();
 
        if (old_level != level) {
                if (clu_set_loglevel(level) == -1)
--- cluster/rgmanager/src/daemons/main.c        2007/08/21 18:18:37     1.43
+++ cluster/rgmanager/src/daemons/main.c        2007/09/19 09:54:19     1.44
@@ -659,7 +659,7 @@
 int
 event_loop(msgctx_t *localctx, msgctx_t *clusterctx)
 {
-       int n, max, ret;
+       int n = 0, max, ret;
        fd_set rfds;
        msgctx_t *newctx;
        struct timeval tv;