CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2003-01-13 00:20:16 UTC
Modified files:
ChangeLog adns/src/check.c adns/src/transmit.c ircd/m_opmode.c
ircd/motd.c ircd/s_user.c
Log message:
Author: Bleep <[EMAIL PROTECTED]>
Log message: Cleanup warnings, fix precedence bugsters.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.374 ircu2.10/ChangeLog:1.375
--- ircu2.10/ChangeLog:1.374 Sun Jan 12 15:54:35 2003
+++ ircu2.10/ChangeLog Sun Jan 12 16:20:03 2003
@@ -1,4 +1,8 @@
2003-01-12 Thomas Helvey <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
* include/class.h, include/ircd_string.h, ircd/class.c,
ircd/gline.c, ircd_string.c: Fix undefined order
of evaluation bug in gline.c, add general purpose hasher for
Index: ircu2.10/adns/src/check.c
diff -u ircu2.10/adns/src/check.c:1.1 ircu2.10/adns/src/check.c:1.2
--- ircu2.10/adns/src/check.c:1.1 Sun Jun 16 15:59:33 2002
+++ ircu2.10/adns/src/check.c Sun Jan 12 16:20:05 2003
@@ -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);
Index: ircu2.10/adns/src/transmit.c
diff -u ircu2.10/adns/src/transmit.c:1.1 ircu2.10/adns/src/transmit.c:1.2
--- ircu2.10/adns/src/transmit.c:1.1 Sun Jun 16 15:59:33 2002
+++ ircu2.10/adns/src/transmit.c Sun Jan 12 16:20:05 2003
@@ -95,7 +95,9 @@
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;
Index: ircu2.10/ircd/m_opmode.c
diff -u ircu2.10/ircd/m_opmode.c:1.14 ircu2.10/ircd/m_opmode.c:1.15
--- ircu2.10/ircd/m_opmode.c:1.14 Sat Jan 11 04:49:26 2003
+++ ircu2.10/ircd/m_opmode.c Sun Jan 12 16:20:06 2003
@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_opmode.c,v 1.14 2003/01/11 12:49:26 bleepster Exp $
+ * $Id: m_opmode.c,v 1.15 2003/01/13 00:20:06 bleepster Exp $
*/
/*
@@ -142,7 +142,6 @@
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 @@
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;
}
Index: ircu2.10/ircd/motd.c
diff -u ircu2.10/ircd/motd.c:1.15 ircu2.10/ircd/motd.c:1.16
--- ircu2.10/ircd/motd.c:1.15 Sat Jan 11 04:49:27 2003
+++ ircu2.10/ircd/motd.c Sun Jan 12 16:20:06 2003
@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: motd.c,v 1.15 2003/01/11 12:49:27 bleepster Exp $
+ * $Id: motd.c,v 1.16 2003/01/13 00:20:06 bleepster Exp $
*/
#include "config.h"
@@ -64,7 +64,6 @@
{
struct Motd* tmp;
int type = MOTD_UNIVERSAL;
- const char *s;
assert(0 != path);
Index: ircu2.10/ircd/s_user.c
diff -u ircu2.10/ircd/s_user.c:1.62 ircu2.10/ircd/s_user.c:1.63
--- ircu2.10/ircd/s_user.c:1.62 Thu Jan 9 14:08:47 2003
+++ ircu2.10/ircd/s_user.c Sun Jan 12 16:20:06 2003
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_user.c,v 1.62 2003/01/09 22:08:47 shad0w Exp $
+ * $Id: s_user.c,v 1.63 2003/01/13 00:20:06 bleepster Exp $
*/
#include "config.h"
@@ -1286,8 +1286,8 @@
}
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))
----------------------- End of diff -----------------------
