Fix a gcc3-ism.

diff --git a/src/irc.c b/src/irc.c
index 522832ef51baf2a3dadb808fb64a4916243f916e..8b398e6c3cb68feae476982d3173da37bc96065a 100644 (file)
--- a/src/irc.c
+++ b/src/irc.c
@@ -793,6 +793,11 @@ static void m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo
    node_t *node;
    struct ChannelConf *channel;
 
+   USE_VAR(parv);
+   USE_VAR(parc);
+   USE_VAR(msg);
+   USE_VAR(notused);
+
    log_printf("IRC -> Connected to %s:%d", IRCItem->server, IRCItem->port);
 
    /* Identify to nickserv if needed */
@@ -825,11 +830,6 @@ static void m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo
       else
          irc_send("JOIN %s", channel->name);
    }
-
-   USE_VAR(parv);
-   USE_VAR(parc);
-   USE_VAR(msg);
-   USE_VAR(notused);
 }
 
 
@@ -844,6 +844,9 @@ static void m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo
  */
 static void m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
 {
+   USE_VAR(msg);
+   USE_VAR(source_p);
+
    if(parc < 3)
       return;
 
@@ -851,9 +854,6 @@ static void m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *s
       log_printf("IRC -> PING? PONG!");
 
    irc_send("PONG %s", parv[2]);
-   
-   USE_VAR(msg);
-   USE_VAR(source_p);
 }
 
 
@@ -873,6 +873,9 @@ static void m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *s
 static void m_invite(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
 {
    struct ChannelConf *channel;
+   
+   USE_VAR(msg);
+   USE_VAR(source_p);
 
    if(parc < 4)
       return;
@@ -883,9 +886,6 @@ static void m_invite(char **parv, unsigned int parc, char *msg, struct UserInfo
       return;
 
    irc_send("JOIN %s %s", channel->name, channel->key);
-   
-   USE_VAR(msg);
-   USE_VAR(source_p);
 }
 
 
@@ -957,14 +957,14 @@ static void m_privmsg(char **parv, unsigned int parc, char *msg, struct UserInfo
 
 static void m_ctcp(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
 {
+   USE_VAR(parc);
+   USE_VAR(msg);
+
    if(strncasecmp(parv[3], "\001VERSION\001", 9) == 0)
    {
       irc_send("NOTICE %s :\001VERSION Blitzed Open Proxy Monitor %s\001",
             source_p->irc_nick, VERSION);
    }
-
-   USE_VAR(parc);
-   USE_VAR(msg);
 }
 
 
@@ -1080,13 +1080,13 @@ static void m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo
 static void m_userhost(char **parv, unsigned int parc, char *msg,
       struct UserInfo *source_p)
 {
+   USE_VAR(msg);
+   USE_VAR(source_p);
+
    if(parc < 4)
       return;
 
    command_userhost(parv[3]);
-
-   USE_VAR(msg);
-   USE_VAR(source_p);
 }
 
 /* m_cannot_join
@@ -1104,6 +1104,9 @@ static void m_cannot_join(char **parv, unsigned int parc, char *msg,
 {
    struct ChannelConf *channel;
 
+   USE_VAR(msg);
+   USE_VAR(source_p);
+
    if(parc < 5)
       return;
 
@@ -1115,9 +1118,6 @@ static void m_cannot_join(char **parv, unsigned int parc, char *msg,
       return;
 
    irc_send("%s", channel->invite);
-
-   USE_VAR(msg);
-   USE_VAR(source_p);
 }
 
 
@@ -1133,11 +1133,11 @@ static void m_cannot_join(char **parv, unsigned int parc, char *msg,
 
 static void m_kill(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
 {
-   /* Restart bopm to rehash */
-   main_restart();
-
    USE_VAR(parv);
    USE_VAR(parc);
    USE_VAR(msg);
    USE_VAR(source_p);
+
+   /* Restart bopm to rehash */
+   main_restart();
 }

diff --git a/src/opercmd.c b/src/opercmd.c
index f64ede1fbd4b7c0296825cd0bdbffd5389784778..2a5e75a744c2da153b2d85b5ddf080f12c2d9107 100644 (file)
--- a/src/opercmd.c
+++ b/src/opercmd.c
@@ -155,6 +155,8 @@ void command_parse(char *command, char *msg, struct ChannelConf *target,
    struct Command *cs;
    node_t *node;
 
+   USE_VAR(msg);
+
    if(OPT_DEBUG)
    {
       log_printf("COMMAND -> Parsing command (%s) from %s [%s]", command,
@@ -209,8 +211,6 @@ void command_parse(char *command, char *msg, struct ChannelConf *target,
    }
 
    irc_send("USERHOST %s", source_p->irc_nick);
-
-   USE_VAR(msg);
 }
 
 
@@ -343,9 +343,9 @@ void command_userhost(char *reply)
 
 static void cmd_check(char *param, char *source, struct ChannelConf *target)
 {
-   scan_manual(param, target);
-
    USE_VAR(source);
+
+   scan_manual(param, target);
 }
 
 
@@ -362,10 +362,10 @@ static void cmd_check(char *param, char *source, struct ChannelConf *target)
 
 static void cmd_stat(char *param, char *source, struct ChannelConf *target)
 {
-   stats_output(target->name);
-
    USE_VAR(param);
    USE_VAR(source);
+
+   stats_output(target->name);
 }
 
 
@@ -381,10 +381,10 @@ static void cmd_stat(char *param, char *source, struct ChannelConf *target)
 
 static void cmd_fdstat(char *param, char *source, struct ChannelConf *target)
 {
-   fdstats_output(target->name);
-
    USE_VAR(param);
    USE_VAR(source);
+
+   fdstats_output(target->name);
 }
 
 

diff --git a/src/scan.c b/src/scan.c
index 7a502de0573187d5cf26d5cee97308201bc66750..8b5d98584f792183131e655cd54be817aa2dc3fe 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -614,6 +614,9 @@ void scan_open_proxy(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
    struct scan_struct *ss;
    struct scanner_struct *scs;
 
+   USE_VAR(scanner);
+   USE_VAR(notused);
+
    /* Record that a scan happened */
    scan_log(remote);
 
@@ -649,9 +652,6 @@ void scan_open_proxy(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
 
    /* Record the proxy for stats purposes */
    stats_openproxy(remote->protocol);
-
-   USE_VAR(scanner);
-   USE_VAR(notused);
 }
 
 
@@ -675,6 +675,9 @@ void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
    struct scan_struct *ss;
    struct scanner_struct *scs;
 
+   USE_VAR(scanner);
+   USE_VAR(notused);
+
    /* Record that a scan happened */
    scan_log(remote);
 
@@ -695,9 +698,6 @@ void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
             remote->port, scan_gettype(remote->protocol), scs->name,
             remote->bytes_read);
    }
-
-   USE_VAR(scanner);
-   USE_VAR(notused);
 }
 
 
@@ -720,6 +720,9 @@ static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
    struct scan_struct *ss;
    struct scanner_struct *scs;
 
+   USE_VAR(scanner);
+   USE_VAR(notused);
+
    /* Record that a scan happened */
    scan_log(remote);
 
@@ -741,9 +744,6 @@ static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
             remote->port, scan_gettype(remote->protocol), scs->name,
             remote->bytes_read);
    }
-
-   USE_VAR(scanner);
-   USE_VAR(notused);
 }
 
 
@@ -767,6 +767,9 @@ static void scan_end(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
    struct scan_struct *ss;
    struct scanner_struct *scs;
 
+   USE_VAR(scanner);
+   USE_VAR(notused);
+
    scs = (struct scanner_struct *) data;
    ss = (struct scan_struct *) remote->data;
 
@@ -775,9 +778,6 @@ static void scan_end(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
 
    ss->scans--;
    scan_checkfinished(ss);
-
-   USE_VAR(scanner);
-   USE_VAR(notused);
 }
 
 
@@ -804,6 +804,8 @@ static void scan_handle_error(OPM_T *scanner, OPM_REMOTE_T *remote,
    struct scan_struct *ss;
    struct scanner_struct *scs;
 
+   USE_VAR(scanner);
+
    scs = (struct scanner_struct *) data;
    ss = (struct scan_struct *) remote->data;
 
@@ -850,8 +852,6 @@ static void scan_handle_error(OPM_T *scanner, OPM_REMOTE_T *remote,
          }
          break;
    }
-
-   USE_VAR(scanner);
 }