Author: Alex Badea <vampire@p16.pub.ro>

Log message:

Cleaned up a couple of compiler warnings, fixed Makefile.in so it works
for compiling outside the source tree

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

diff --git a/ChangeLog b/ChangeLog
index bc1c51214bed7008aad407f82618320b2455f703..0ab716dfd85c569d031a10aed7cdf8878f991aa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-03  Alex Badea  <vampire@p16.pub.ro>
+
+       * include/channel.h: fix compiler warnings (paratheses around &&)
+
+       * ircd/channel.c (modebuf_extract): fix compiler warnings
+       (uninitialized variables)
+
+       * ircd/Makefile.in: make ircd properly compile outside the
+       source tree
+
 2002-04-03  Alex Badea  <vampire@p16.pub.ro>
 
        * include/s_user.h: added a sptr parameter to InfoFormatter

diff --git a/include/channel.h b/include/channel.h
index 812ab74a448bd1196613a74bd83eb2aa7240ed2a..ff39e43cebc820e56097e9da27f96434b1d82f44 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -107,7 +107,7 @@ struct Client;
 #define HiddenChannel(x)        ((x) && ((x)->mode.mode & MODE_PRIVATE))
 /* channel visible */
 #define ShowChannel(v,c)        (PubChannel(c) || find_channel_member((v),(c)) || \
-                                 (IsAnOper(v)) && HasPriv(v, PRIV_LIST_CHAN))
+                                 (IsAnOper(v) && HasPriv(v, PRIV_LIST_CHAN)))
 #define PubChannel(x)           ((!x) || ((x)->mode.mode & \
                                     (MODE_PRIVATE | MODE_SECRET)) == 0)
 #define is_listed(x)            ((x)->mode.mode & MODE_LISTED)

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index c0b6b0b5753a56ca55508450a54d77e2b5995cf7..c60189dcf10988571db2dba20794181fe3451fc8 100644 (file)
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -240,7 +240,7 @@ version.c: version.c.SH s_serv.c s_user.c channel.c s_bsd.c s_misc.c ircd.c \
        ${SHELL} ${srcdir}/version.c.SH
 
 ../include/patchlist.h:
-       (cd .. ; ./ircd-patch update)
+       (cd ${top_srcdir} ; ./ircd-patch update)
 
 ircd_string.o: ircd_string.c chattr.tab.c
 
@@ -251,10 +251,10 @@ chattr.tab.c: table_gen
        ./table_gen > chattr.tab.c
 
 lex.yy.c: ircd_lexer.l y.tab.h
-       ${LEX} ircd_lexer.l
+       ${LEX} ${srcdir}/ircd_lexer.l
 
 y.tab.c y.tab.h: ircd_parser.y
-       ${YACC} -d ircd_parser.y
+       ${YACC} -d ${srcdir}/ircd_parser.y
 
 mkbindir:
        @test -d ${BINDIR} || mkdir ${BINDIR}

diff --git a/ircd/channel.c b/ircd/channel.c
index 11a0f0219dbe4a7408c7adce76c512ed0f12f8ff..56fa07fe81ff1177df5966167e188fe37902d733 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -1984,7 +1984,7 @@ modebuf_extract(struct ModeBuf *mbuf, char *buf)
   int i, bufpos = 0, len;
   int *flag_p;
   char *key = 0, limitbuf[20];
-  char *apass, *upass;
+  char *apass = 0, *upass = 0;
 
   assert(0 != mbuf);
   assert(0 != buf);