Author: Bleep <tom.helvey@cox.net>

Log message: Cleanup warnings, fix precedence bugsters.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@917 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index d5ee7d961aaf9a6ccb1d06ddc73885522f6b1756..1c3ddf4ad500ed491432652e7275ac7f7e779662 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Thomas Helvey <tom.helvey@cox.net>
+       * adns/src/check.c, adns/src/transmit.c, ircd/m_opmode.c,
+       ircd/motd.c, ircd/s_user.c: Cleanup warnings, fix precedence
+       bugs in transmit.c and m_opmode.c.
 2003-01-12  Thomas Helvey <tom.helvey@cox.net>
        * include/class.h, include/ircd_string.h, ircd/class.c,
        ircd/gline.c, ircd_string.c: Fix undefined order

diff --git a/adns/src/check.c b/adns/src/check.c
index 7cca534520c78baf7885d77e2d3171949a7cc0b9..23467e10f8e5aba89f1a22c7ddb28bb03cef9705 100644 (file)
--- a/adns/src/check.c
+++ b/adns/src/check.c
@@ -26,6 +26,7 @@
  */
 
 #include "internal.h"
+#include <stdlib.h>
 
 void adns_checkconsistency(adns_state ads, adns_query qu) {
   adns__consistency(ads,qu,cc_user);

diff --git a/adns/src/transmit.c b/adns/src/transmit.c
index 47785e6b57bab73c7a773a12b54630d54d789bc2..d2d3d0cb6e5cc565c7e80c1524441006ca3f25a8 100644 (file)
--- a/adns/src/transmit.c
+++ b/adns/src/transmit.c
@@ -95,7 +95,9 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
        if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
        if (ctype_digit(p[0])) {
          if (ctype_digit(p[1]) && ctype_digit(p[2])) {
-           c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*p++ - '0');
+           c =  (*p++ - '0') * 100;
+            c += (*p++ - '0') * 10;
+            c += (*p++ - '0');
            if (c >= 256) return adns_s_querydomaininvalid;
          } else {
            return adns_s_querydomaininvalid;

diff --git a/ircd/m_opmode.c b/ircd/m_opmode.c
index b7fde9a196e0957afcb17d79b0a566ffa6e15648..60781dd16e53d439003cb06ef29f8023b77da8a7 100644 (file)
--- a/ircd/m_opmode.c
+++ b/ircd/m_opmode.c
@@ -142,7 +142,6 @@ int mo_opmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   char *chname;
   const char *qreason;
   int force = 0;
-  struct Membership *member;
 
   if (!feature_bool(FEAT_CONFIG_OPERCMDS))
     return send_reply(sptr, ERR_DISABLED, "OPMODE");
@@ -154,7 +153,8 @@ int mo_opmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (*chname == '!')
   {
     chname++;
-    if (!HasPriv(sptr, IsLocalChannel(chname) ? PRIV_FORCE_LOCAL_OPMODE : PRIV_FORCE_OPMODE))
+    if (!HasPriv(sptr, IsLocalChannel(chname) ? PRIV_FORCE_LOCAL_OPMODE
+                                              : PRIV_FORCE_OPMODE))
       return send_reply(sptr, ERR_NOPRIVILEGES);
     force = 1;
   }

diff --git a/ircd/motd.c b/ircd/motd.c
index 76dd87c7fb45fe7bfbfea3d5483a5fa6fcc43605..11b606427e4cdf0be65ce666ae81ff8d2820f290 100644 (file)
--- a/ircd/motd.c
+++ b/ircd/motd.c
@@ -64,7 +64,6 @@ motd_create(const char *hostmask, const char *path, int maxcount)
 {
   struct Motd* tmp;
   int type = MOTD_UNIVERSAL;
-  const char *s;
   
   assert(0 != path);
   

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 990d4ff7646edd1c3aca97c2f1f8f1fc21be85aa..ce5ea555e1a5c71b1f8887e9e601db3427d7d0f8 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1286,8 +1286,8 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv
   }
   if (MyConnect(sptr))
   {
-    if (FlagHas(&setflags, FLAG_OPER) || FlagHas(&setflags, FLAG_LOCOP) &&
-       !IsAnOper(sptr))
+    if ((FlagHas(&setflags, FLAG_OPER) || FlagHas(&setflags, FLAG_LOCOP)) &&
+        !IsAnOper(sptr))
       det_confs_butmask(sptr, CONF_CLIENT & ~CONF_OPS);
 
     if (SendServNotice(sptr))