- Use 'const' and 'unsigned' whenever possible

- Removed pointless 0 assignments

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

diff --git a/src/dnsbl.c b/src/dnsbl.c
index f0c8f5649346590ad8da4491c0e6db7ea4208529..9bad3c1d73824707797e9146e9003ecf5d781762 100644 (file)
--- a/src/dnsbl.c
+++ b/src/dnsbl.c
@@ -58,7 +58,6 @@ dnsbl_add(struct scan_struct *ss)
   int res;
   struct dnsbl_scan *ds;
 
-
   if (inet_pton(AF_INET, ss->ip, &in) <= 0)
   {
     log_printf("DNSBL -> Invalid address '%s', ignoring.", ss->ip);
@@ -109,7 +108,7 @@ dnsbl_positive(struct scan_struct *ss, struct BlacklistConf *bl, unsigned char t
   {
     LIST_FOREACH(p, bl->reply->head)
     {
-      struct BlacklistReplyConf *item = p->data;
+      const struct BlacklistReplyConf *item = p->data;
 
       if (item->number & type)
       {
@@ -128,7 +127,7 @@ dnsbl_positive(struct scan_struct *ss, struct BlacklistConf *bl, unsigned char t
   {
     LIST_FOREACH(p, bl->reply->head)
     {
-      struct BlacklistReplyConf *item = p->data;
+      const struct BlacklistReplyConf *item = p->data;
 
       if (item->number == type)
       {

diff --git a/src/irc.c b/src/irc.c
index d030ee4ac458da15d3b2d27f9a85d59aca8d05bb..2d3a14f6b35fd3ac13a33829138462976d73f019 100644 (file)
--- a/src/irc.c
+++ b/src/irc.c
@@ -250,7 +250,7 @@ irc_send(const char *data, ...)
 {
   va_list arglist;
   char buf[MSGLENMAX];
-  int len = 0;
+  size_t len = 0;
 
   va_start(arglist, data);
   len = vsnprintf(buf, sizeof(buf), data, arglist);
@@ -294,7 +294,6 @@ irc_send_channels(const char *data, ...)
   vsnprintf(buf, sizeof(buf), data, arglist);
   va_end(arglist);
 
-
   LIST_FOREACH(node, IRCItem->channels->head)
   {
     const struct ChannelConf *chan = node->data;
@@ -715,7 +714,7 @@ m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo *notused)
   /* Join all listed channels. */
   LIST_FOREACH(node, IRCItem->channels->head)
   {
-    struct ChannelConf *channel = node->data;
+    const struct ChannelConf *channel = node->data;
 
     if (EmptyString(channel->name))
       continue;
@@ -860,7 +859,7 @@ m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
   regmatch_t pmatch[5];
 
   static char errmsg[256];
-  int errnum, i;
+  int errnum;
   char *user[4];
 
   if (parc < 4)
@@ -908,7 +907,7 @@ m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
    *   HOSTNAME: pmatch[3].rm_so  TO  pmatch[3].rm_eo
    *   IP      : pmatch[4].rm_so  TO  pmatch[4].rm_eo
    */
-  for (i = 0; i < 4; ++i)
+  for (unsigned int i = 0; i < 4; ++i)
   {
     user[i] = (parv[3] + pmatch[i + 1].rm_so);
     *(parv[3] + pmatch[i + 1].rm_eo) = '\0';
@@ -962,7 +961,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)
 {
-  struct ChannelConf *channel;
+  const struct ChannelConf *channel = NULL;
 
   if (parc < 5)
     return;

diff --git a/src/opercmd.c b/src/opercmd.c
index 43fa45aa4e7f418f314c8a861de4fb9c1586f676..f542d2c39ae4a536c32483cc60343f7005e10325 100644 (file)
--- a/src/opercmd.c
+++ b/src/opercmd.c
@@ -89,9 +89,8 @@ command_init(void)
 void
 command_timer(void)
 {
-  static unsigned short interval;
+  static unsigned int interval;
   node_t *node, *next;
-  struct Command *cs;
   time_t present;
 
   /* Only perform command removal every COMMANDINTERVAL seconds */
@@ -104,7 +103,7 @@ command_timer(void)
 
   LIST_FOREACH_SAFE(node, next, COMMANDS->head)
   {
-    cs = node->data;
+    struct Command *cs = node->data;
 
     if ((present - cs->added) > COMMANDTIMEOUT)
     {

diff --git a/src/scan.c b/src/scan.c
index 48e52037a9037a367f8c2331d5ae675259a89097..f8513c3f9c45bf0d3be04935dd3a9f5ecad2e8d5 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -115,7 +115,7 @@ scan_cycle(void)
 void
 scan_timer(void)
 {
-  static int nc_counter;
+  static unsigned int nc_counter;
 
   if (OptionsItem->negcache > 0)
   {
@@ -318,8 +318,8 @@ scan_connect(char **user, char *msg)
    * username/hostname can be.  Some ircds use really mad values for
    * these.
    */
-  static char mask[MSGLENMAX];
-  static char ipmask[MSGLENMAX];
+  char mask[MSGLENMAX];
+  char ipmask[MSGLENMAX];
 
   /* Check negcache before anything */
   if (OptionsItem->negcache > 0)
@@ -436,11 +436,7 @@ scan_create(char **user, char *msg)
   ss->irc_hostname = xstrdup(user[2]);
   ss->ip = xstrdup(user[3]);
   ss->proof = xstrdup(msg);
-
   ss->remote = opm_remote_create(ss->ip);
-  ss->scans = 0;
-  ss->positive = 0;
-  ss->manual_target = NULL;
 
   assert(ss->remote);
   return ss;
@@ -918,20 +914,9 @@ scan_manual(char *param, struct ChannelConf *target)
   ip = inet_ntoa(*addr);
 
   ss = xcalloc(sizeof *ss);
-
-  /* These don't exist in a manual scan */
-  ss->irc_nick     = NULL;
-  ss->irc_username = NULL;
-  ss->irc_hostname = NULL;
-  ss->proof        = NULL;
-
   ss->ip = xstrdup(ip);
-
   ss->remote = opm_remote_create(ss->ip);
   ss->remote->data = ss;
-  ss->scans = 0;
-  ss->positive = 0;
-
   ss->manual_target = target;
 
   assert(ss->remote);
@@ -1010,14 +995,13 @@ scan_manual(char *param, struct ChannelConf *target)
  *     0 if mask is not in list 
  */
 int
-scan_checkexempt(char *mask, char *ipmask)
+scan_checkexempt(const char *mask, const char *ipmask)
 {
   node_t *node;
-  char *exempt_mask;
 
   LIST_FOREACH(node, ExemptItem->masks->head)
   {
-    exempt_mask = node->data;
+    const char *exempt_mask = node->data;
 
     if (!match(exempt_mask, mask) || !match(exempt_mask, ipmask))
       return 1;

diff --git a/src/scan.h b/src/scan.h
index e7c378baed26ab40b0afe24ca0ac74870d663c54..8fb3a467c777f2818593756c5e8bd14530725748 100644 (file)
--- a/src/scan.h
+++ b/src/scan.h
@@ -39,7 +39,7 @@ extern void scan_cycle(void);
 extern void scan_connect(char **, char *);
 extern void scan_checkfinished(struct scan_struct *);
 extern void scan_manual(char *, struct ChannelConf *);
-extern int scan_checkexempt(char *, char *);
+extern int scan_checkexempt(const char *, const char *);
 extern void scan_timer(void);
 extern void scan_positive(struct scan_struct *, const char *, const char *);