- Fixed coding convention issues

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5322 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/dnsbl.c b/src/dnsbl.c
index de5992c4cbc10ee63b05cf15d7fd1b3111788b5f..23e7ef72a6593666025223fa82f91c885ce3b884 100644 (file)
--- a/src/dnsbl.c
+++ b/src/dnsbl.c
@@ -149,7 +149,7 @@ dnsbl_positive(struct scan_struct *ss, struct BlacklistConf *bl, unsigned char t
   if (ss->manual_target)
     irc_send("PRIVMSG %s :CHECK -> DNSBL -> %s appears in BL zone %s (%s)",
              ss->manual_target->name, ss->ip, bl->name, text_type);
-  else if (!ss->positive)
+  else if (ss->positive == 0)
   {
     /* Only report it if no other scans have found positives yet. */
     scan_positive(ss, (bl->kline[0] ? bl->kline : IRCItem->kline), text_type);

diff --git a/src/irc.c b/src/irc.c
index f4922ae4bc0fe6b1fcb391642682a0bff5652d4d..11efa71c24b15cf8b63855e2c3d024d2f5add73f 100644 (file)
--- a/src/irc.c
+++ b/src/irc.c
@@ -65,17 +65,16 @@ static struct ChannelConf *get_channel(const char *);
 static struct UserInfo *userinfo_create(char *);
 static void userinfo_free(struct UserInfo *source);
 
-static void m_ping(char **, unsigned int, char *, struct UserInfo *);
-static void m_invite(char **, unsigned int, char *, struct UserInfo *);
-static void m_privmsg(char **, unsigned int, char *, struct UserInfo *);
-static void m_ctcp(char **, unsigned int, char *, struct UserInfo *);
-static void m_notice(char **, unsigned int, char *, struct UserInfo *);
-static void m_perform(char **, unsigned int, char *, struct UserInfo *);
-static void m_userhost(char **, unsigned int, char *, struct UserInfo *);
-static void m_cannot_join(char **, unsigned int, char *, struct UserInfo *);
-static void m_kill(char **, unsigned int, char *, struct UserInfo *);
-
-extern struct cnode *nc_head;
+static void m_ping(char *[], unsigned int, char *, struct UserInfo *);
+static void m_invite(char *[], unsigned int, char *, struct UserInfo *);
+static void m_privmsg(char *[], unsigned int, char *, struct UserInfo *);
+static void m_ctcp(char *[], unsigned int, char *, struct UserInfo *);
+static void m_notice(char *[], unsigned int, char *, struct UserInfo *);
+static void m_perform(char *[], unsigned int, char *, struct UserInfo *);
+static void m_userhost(char *[], unsigned int, char *, struct UserInfo *);
+static void m_cannot_join(char *[], unsigned int, char *, struct UserInfo *);
+static void m_kill(char *[], unsigned int, char *, struct UserInfo *);
+
 
 /*
  * Certain variables we don't want to allocate memory for over and over
@@ -556,14 +555,13 @@ irc_timer(void)
     log_printf("IRC -> Timeout awaiting data from server.");
     irc_reconnect();
 
-    /* Make sure we dont do this again for a while */
+    /* Make sure we don't do this again for a while */
     time(&IRC_LAST);
   }
   else if (delta >= IRCItem->readtimeout / 2)
   {
     /*
-     * Generate some data so high ping times or bugs in certain
-     * ircds (*cough* unreal *cough*) don't cause uneeded
+     * Generate some data so high ping times don't cause uneeded
      * reconnections
      */
     irc_send("PING :HOPM");
@@ -687,7 +685,7 @@ userinfo_free(struct UserInfo *source_p)
  * the source (parv[0]) is a server.
  */
 static void
-m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo *notused)
+m_perform(char *parv[], unsigned int parc, char *msg, struct UserInfo *notused)
 {
   node_t *node;
 
@@ -736,7 +734,7 @@ m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo *notused)
  * the source (parv[0]) is a server.
  */
 static void
-m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_ping(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   if (parc < 3)
     return;
@@ -758,9 +756,9 @@ m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  * the source (parv[0]) is a server.
  */
 static void
-m_invite(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_invite(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
-  struct ChannelConf *channel;
+  struct ChannelConf *channel = NULL;
 
   if (parc < 4)
     return;
@@ -784,9 +782,9 @@ m_invite(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  * the source (parv[0]) is a server.
  */
 static void
-m_privmsg(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_privmsg(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
-  struct ChannelConf *channel;
+  struct ChannelConf *channel = NULL;
   size_t nick_len;
 
   if (source_p == NULL)
@@ -833,7 +831,7 @@ m_privmsg(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  *
  */
 static void
-m_ctcp(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_ctcp(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   if (strncasecmp(parv[3], "\001VERSION\001", 9) == 0)
     irc_send("NOTICE %s :\001VERSION Hybrid Open Proxy Monitor %s\001",
@@ -853,20 +851,20 @@ m_ctcp(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  *
  */
 static void
-m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_notice(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   static regex_t *preg = NULL;
   regmatch_t pmatch[5];
   int errnum;
   char *user[4];
 
-  if (parc < 4)
-    return;
-
   /* Not interested in notices from users */
   if (source_p)
     return;
 
+  if (parc < 4)
+    return;
+
   /* Compile the regular expression if it has not been already */
   if (preg == NULL)
   {
@@ -941,7 +939,7 @@ m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  *
  */
 static void
-m_userhost(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_userhost(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   if (parc < 4)
     return;
@@ -959,7 +957,7 @@ m_userhost(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
  *
  */
 static void
-m_cannot_join(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_cannot_join(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   const struct ChannelConf *channel = NULL;
 
@@ -986,7 +984,7 @@ m_cannot_join(char **parv, unsigned int parc, char *msg, struct UserInfo *source
  *
  */
 static void
-m_kill(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
+m_kill(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
 {
   /* Restart hopm to rehash */
   main_restart();

diff --git a/src/irc.h b/src/irc.h
index a4be620a776f882a13500e67e59f51d4e6097f5b..03e78f63b674524dfda5d17f4625412e7c3702db 100644 (file)
--- a/src/irc.h
+++ b/src/irc.h
@@ -16,7 +16,7 @@ struct UserInfo
 struct CommandHash
 {
   const char *command;
-  void (*handler)(char **, unsigned int, char *, struct UserInfo *);
+  void (*handler)(char *[], unsigned int, char *, struct UserInfo *);
 };
 
 extern void irc_send(const char *, ...);

diff --git a/src/negcache.c b/src/negcache.c
index 55c521e5ab134131c08bf5cdc0521cd47a5e1061..ef4e0333b553447226b2dce099f04b827e1e3411 100644 (file)
--- a/src/negcache.c
+++ b/src/negcache.c
@@ -63,9 +63,9 @@ static struct cnode *nc_insert(struct cnode *head, const unsigned long ip);
 static void nc_rebuild(struct cnode *old_head, struct cnode *new_head,
                        struct cnode *n, time_t now);
 
+struct cnode *nc_head;
 time_t last_nc_expire;
 unsigned int maxb;
-extern struct cnode *nc_head;
 
 /*
  * Return the bit which appears k bits from the right in x.

diff --git a/src/negcache.h b/src/negcache.h
index d1e227b87556bcd8eabb62a3e2964e5780d6683e..765f16308cb81f2dd7f71af2ccd385e16c03ff5a 100644 (file)
--- a/src/negcache.h
+++ b/src/negcache.h
@@ -10,6 +10,7 @@ struct cnode
   struct cnode *r;  /* Node to the right. */
 };
 
+extern struct cnode *nc_head;
 extern void nc_init(struct cnode **);
 extern struct cnode *check_neg_cache(const unsigned long);
 extern void negcache_insert(const char *);

diff --git a/src/scan.c b/src/scan.c
index dbc1934100cdd9b8033fd581f5bf6f18a68b5c58..6eabd6eca063d3373307910b0dd9a90c6a1f2bd4 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -65,14 +65,9 @@ static list_t *SCANNERS = NULL;   /* List of OPM_T */
 static list_t *MASKS    = NULL;   /* Associative list of masks->scanners */
 
 
-/* Negative Cache */
-struct cnode *nc_head;
-
-
 /* Function declarations */
-
-struct scan_struct *scan_create(char **, char *);
-void scan_free(struct scan_struct *);
+static struct scan_struct *scan_create(char *[], char *);
+static void scan_free(struct scan_struct *);
 static void scan_irckline(struct scan_struct *, const char *, const char *);
 static void scan_negative(struct scan_struct *);
 static void scan_log(OPM_REMOTE_T *);
@@ -306,7 +301,7 @@ scan_init(void)
  *
  */
 void
-scan_connect(char **user, char *msg)
+scan_connect(char *user[], char *msg)
 {
   struct sockaddr_in ip;
   node_t *p, *p2;
@@ -429,8 +424,8 @@ scan_connect(char **user, char *msg)
  * Return: Pointer to new scan_struct
  *
  */
-struct scan_struct *
-scan_create(char **user, char *msg)
+static struct scan_struct *
+scan_create(char *user[], char *msg)
 {
   struct scan_struct *ss = xcalloc(sizeof *ss);
 
@@ -455,7 +450,7 @@ scan_create(char **user, char *msg)
  *
  * Return: NONE
  */
-void
+static void
 scan_free(struct scan_struct *ss)
 {
   if (ss == NULL)
@@ -492,7 +487,7 @@ scan_checkfinished(struct scan_struct *ss)
                    ss->irc_nick, ss->irc_username, ss->irc_hostname);
 
       /* Scan was a negative */
-      if (!ss->positive)
+      if (ss->positive == 0)
         scan_negative(ss);
     }
 

diff --git a/src/scan.h b/src/scan.h
index 1306359cea2fa7022e185cd9cd11dcf8c4b2bee5..8ba06da8ecedbf78727a81080016368c43d2e84a 100644 (file)
--- a/src/scan.h
+++ b/src/scan.h
@@ -19,7 +19,6 @@ struct scan_struct
   struct ChannelConf *manual_target;
 };
 
-
 struct scanner_struct
 {
   char *name;
@@ -33,20 +32,19 @@ struct protocol_assoc
   const char *name;
 };
 
+struct kline_format_assoc
+{
+  char key;
+  const void *data;
+};
+
 extern void scan_init(void);
 extern const char *scan_gettype(int);
 extern void scan_cycle(void);
-extern void scan_connect(char **, char *);
+extern void scan_connect(char *[], char *);
 extern void scan_checkfinished(struct scan_struct *);
 extern void scan_manual(char *, struct ChannelConf *);
 extern int scan_checkexempt(const char *, const char *);
 extern void scan_timer(void);
 extern void scan_positive(struct scan_struct *, const char *, const char *);
-
-struct kline_format_assoc
-{
-  char key;
-  const void *data;
-};
-
 #endif /* SCAN_H */