From: sirvulcan Date: Thu, 25 Dec 2008 06:49:44 +0000 (+0000) Subject: fbsd 7 warning fixes, this needs further testing *hint hint* X-Git-Tag: 1.9~257 X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/4cb36ef05734bc040784d67794a3376b0e3a5ec2 fbsd 7 warning fixes, this needs further testing *hint hint* --- diff --git a/ChangeLog b/ChangeLog index aafaa5c..ce1baea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,28 @@ /*********************************************************************** X3 ChangeLog +2008-12-25 Neil Spierling + + * configure: Regenerated. + + * configure.in: Added math.h check. + + * rx/Makefile.in: Regenerated. + + * src/chanserv.c: Warning fixes. + + * src/config.h.in: Regenerated. + + * src/Makefile.in: Regenerated. + + * src/math.c: Warning fixes. + + * src/nickserv.c: Warning fixes. + + * src/opserv.c: Warning fixes. + + * src/proto-p10.c: Warning fixes. + 2008-12-24 Neil Spierling * src/chanserv.c: Fix for SF bug #2423717. Invalid automode choices diff --git a/Makefile.in b/Makefile.in index f2adb1b..d6b2d86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +17,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -pythonpath = @pythonpath@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -97,8 +96,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -PY_CFLAGS = @PY_CFLAGS@ -PY_LIBS = @PY_LIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -118,6 +115,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PY_CFLAGS = @PY_CFLAGS@ +PY_LIBS = @PY_LIBS@ RANLIB = @RANLIB@ RX_INCLUDES = @RX_INCLUDES@ RX_LIBS = @RX_LIBS@ @@ -168,6 +167,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pythonpath = @pythonpath@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -294,8 +294,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -320,8 +320,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -331,12 +331,13 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -407,10 +408,6 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -437,8 +434,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -589,7 +584,7 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/configure b/configure index 41b5ef0..c3dc713 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 2092 2008-04-01 01:34:15Z sirvulcan . +# From configure.in Id: configure.in 2301 2008-11-07 05:16:20Z rubin . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for X3 1.6. # @@ -5961,7 +5961,8 @@ done -for ac_header in GeoIP.h GeoIPCity.h fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h + +for ac_header in GeoIP.h GeoIPCity.h fcntl.h math.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -11314,22 +11315,21 @@ echo "$as_me: $ac_file is unchanged" >&6;} fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. -_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $ac_file | $ac_file:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11366,7 +11366,7 @@ echo "$as_me: executing $ac_file commands" >&6;} # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff --git a/configure.in b/configure.in index 715f800..6cc9feb 100644 --- a/configure.in +++ b/configure.in @@ -70,7 +70,7 @@ AC_HEADER_TIME AC_STRUCT_TM dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi -AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h ,,) +AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h fcntl.h math.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h ,,) dnl portability stuff, hurray! -Jedi AC_CHECK_MEMBER([struct sockaddr.sa_len], diff --git a/rx/Makefile.in b/rx/Makefile.in index ef54b04..6ecd005 100644 --- a/rx/Makefile.in +++ b/rx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ am_librx_a_OBJECTS = hashrexp.$(OBJEXT) rx.$(OBJEXT) rxanal.$(OBJEXT) \ rxspencer.$(OBJEXT) rxstr.$(OBJEXT) rxsuper.$(OBJEXT) \ rxunfa.$(OBJEXT) librx_a_OBJECTS = $(am_librx_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src +DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -112,6 +112,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PY_CFLAGS = @PY_CFLAGS@ +PY_LIBS = @PY_LIBS@ RANLIB = @RANLIB@ RX_INCLUDES = @RX_INCLUDES@ RX_LIBS = @RX_LIBS@ @@ -162,6 +164,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pythonpath = @pythonpath@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -281,8 +284,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -294,8 +297,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -305,12 +308,13 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff --git a/src/Makefile.in b/src/Makefile.in index ba365eb..cd39793 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,7 +19,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -pythonpath = @pythonpath@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -71,10 +70,10 @@ x3_OBJECTS = $(am_x3_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PY_CFLAGS) $(AM_CPPFLAGS) \ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(PY_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(PY_LIBS) -o $@ +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \ $(EXTRA_x3_SOURCES) DIST_SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \ @@ -109,8 +108,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -PY_CFLAGS = @PY_CFLAGS@ -PY_LIBS = @PY_LIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @RX_LIBS@ @@ -130,6 +127,8 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PY_CFLAGS = @PY_CFLAGS@ +PY_LIBS = @PY_LIBS@ RANLIB = @RANLIB@ RX_INCLUDES = @RX_INCLUDES@ RX_LIBS = @RX_LIBS@ @@ -180,6 +179,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pythonpath = @pythonpath@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -324,11 +324,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-helpserv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-memoserv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-python.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-snoop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-sockcheck.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-track.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-webtv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-python.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modcmd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nickserv.Po@am__quote@ @@ -364,8 +364,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -377,8 +377,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -388,12 +388,13 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff --git a/src/chanserv.c b/src/chanserv.c index caa911b..b39dd9b 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -7098,7 +7098,7 @@ static CHANSERV_FUNC(cmd_spin) if(!channel) return 1; - int type, lamep = 1; + int type = 0, lamep = 1; char *tstr; tstr = conf_get_data("server/type", RECDB_QSTRING); @@ -7183,7 +7183,7 @@ static CHANSERV_FUNC(cmd_spin) while(complete != 1) { if (rndchans != 15) { chango = 120 + rand() % 600; - sputsock("%s SJ %s #%d %ld", self->numeric, user->numeric, chango, now); + sputsock("%s SJ %s #%d %d", self->numeric, user->numeric, chango, now); rndchans++; } else { if (roundz0r != 1) { diff --git a/src/config.h.in b/src/config.h.in index 61cfef5..2877b31 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -120,6 +120,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MATH_H + /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY @@ -290,9 +293,6 @@ /* Define if LDAP libs are linked */ #undef WITH_LDAP -/* Define if using python */ -#undef WITH_PYTHON - /* Define if using the Boehm GC to garbage collect and check memory leaks */ #undef WITH_MALLOC_BOEHM_GC @@ -314,6 +314,9 @@ /* Define if using the P10 dialect of IRC */ #undef WITH_PROTOCOL_P10 +/* Define if using python */ +#undef WITH_PYTHON + /* Define if SSL libs are linked */ #undef WITH_SSL diff --git a/src/math.c b/src/math.c index adfa2fd..bf7ae8c 100644 --- a/src/math.c +++ b/src/math.c @@ -24,11 +24,11 @@ #include "saxdb.h" #include "timeq.h" -#ifdef HAVE_TGMATH_H -#include +#ifndef HAVE_MATH_H + #include + #include #else -#include -#include + #include #endif #include diff --git a/src/nickserv.c b/src/nickserv.c index d56b513..dad3b87 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -4198,10 +4198,10 @@ search_unregister_func (struct userNode *source, struct handle_info *match) nickserv_unregister_handle(match, source, nickserv); // XXX nickserv hard coded } +#ifdef WITH_LDAP static void search_add2ldap_func (struct userNode *source, struct handle_info *match) { -#ifdef WITH_LDAP int rc; if(match->email_addr && match->passwd && match->handle) { rc = ldap_do_add(match->handle, match->passwd, match->email_addr); @@ -4209,8 +4209,8 @@ search_add2ldap_func (struct userNode *source, struct handle_info *match) send_message(source, nickserv, "NSMSG_LDAP_FAIL_ADD", match->handle, ldap_err2string(rc)); } } -#endif } +#endif static int nickserv_sort_accounts_by_access(const void *a, const void *b) @@ -4907,7 +4907,8 @@ handle_account(struct userNode *user, const char *stamp) hi = dict_find(nickserv_handle_dict, stamp, NULL); if(hi && timestamp && hi->registered != timestamp) { - log_module(MAIN_LOG, LOG_WARNING, "%s using account %s but timestamp does not match %lu is not %lu.", user->nick, stamp, timestamp, hi->registered); + log_module(MAIN_LOG, LOG_WARNING, "%s using account %s but timestamp does not match %s is not %s.", user->nick, stamp, ctime(×tamp), +ctime(&hi->registered)); return; } #else diff --git a/src/opserv.c b/src/opserv.c index 39689f8..0cfbf46 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -1824,7 +1824,7 @@ static MODCMD_FUNC(cmd_svspart) reply("MSG_NOT_CHANNEL_NAME"); return 0; } - if(!(target = GetChannel(argv[2]))) + if(!(target_channel = GetChannel(argv[2]))) { reply("MSG_INVALID_CHANNEL"); return 0; @@ -1835,17 +1835,12 @@ static MODCMD_FUNC(cmd_svspart) return 0; } - if (!(channel = GetChannel(argv[2]))) { - reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name); - return 0; - } - - if (!GetUserMode(channel, target)) { - reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name); + if (!GetUserMode(target_channel, target)) { + reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, target_channel->name); return 0; } - irc_svspart(opserv, target, channel); + irc_svspart(opserv, target, target_channel); reply("OSMSG_SVSPART_SENT"); return 1; } diff --git a/src/proto-p10.c b/src/proto-p10.c index d9944d7..13bc35d 100644 --- a/src/proto-p10.c +++ b/src/proto-p10.c @@ -484,10 +484,10 @@ irc_server(struct server *srv) inttobase64(extranum, srv->num_mask, (srv->numeric[1] || (srv->num_mask >= 64*64)) ? 3 : 2); if (srv == self) { - putsock(P10_SERVER " %s %d %li %li J10 %s%s +s6 :%s", + putsock(P10_SERVER " %s %d %d %d J10 %s%s +s6 :%s", srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description); } else { - putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s6 :%s", + putsock("%s " P10_SERVER " %s %d %d %d %c10 %s%s +s6 :%s", self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); } } @@ -613,10 +613,10 @@ irc_user(struct userNode *user) modes[modelen] = 0; /* we don't need to put the + in modes because it's in the format string. */ - putsock("%s " P10_NICK " %s %d %li %s %s +%s %s %s :%s", + putsock("%s " P10_NICK " %s %d %d %s %s +%s %s %s :%s", user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info); } else { - putsock("%s " P10_NICK " %s %d %li %s %s %s %s :%s", + putsock("%s " P10_NICK " %s %d %d %s %s %s %s :%s", user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info); } } @@ -639,9 +639,9 @@ void irc_account(struct userNode *user, const char *stamp, time_t timestamp) { if(extended_accounts) - putsock("%s " P10_ACCOUNT " %s R %s %lu", self->numeric, user->numeric, stamp, timestamp); + putsock("%s " P10_ACCOUNT " %s R %s %d", self->numeric, user->numeric, stamp, timestamp); else - putsock("%s " P10_ACCOUNT " %s %s %lu", self->numeric, user->numeric, stamp, timestamp); + putsock("%s " P10_ACCOUNT " %s %s %d", self->numeric, user->numeric, stamp, timestamp); } void @@ -824,14 +824,14 @@ irc_introduce(const char *passwd) void irc_gline(struct server *srv, struct gline *gline, int silent) { - putsock("%s " P10_GLINE " %s +%s %ld %ld :%s<%s> %s", + putsock("%s " P10_GLINE " %s +%s %d %d :%s<%s> %s", self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, now, silent ? "AUTO " : "", gline->issuer, gline->reason); } void irc_shun(struct server *srv, struct shun *shun) { - putsock("%s " P10_SHUN " %s +%s %ld :<%s> %s", + putsock("%s " P10_SHUN " %s +%s %d :<%s> %s", self->numeric, (srv ? srv->numeric : "*"), shun->target, shun->expires-now, shun->issuer, shun->reason); } @@ -1022,10 +1022,10 @@ void irc_join(struct userNode *who, struct chanNode *what) { if (what->members.used == 1) { - putsock("%s " P10_CREATE " %s %lu", + putsock("%s " P10_CREATE " %s %d", who->numeric, what->name, what->timestamp); } else { - putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, what->timestamp); + putsock("%s " P10_JOIN " %s %d", who->numeric, what->name, what->timestamp); } } @@ -1515,7 +1515,7 @@ static CMD_FUNC(cmd_account) if((hi = loc_auth(argv[4], argv[5], NULL))) { /* Return a AC A */ - putsock("%s " P10_ACCOUNT " %s A %s %lu", self->numeric, server->numeric , argv[3], hi->registered); + putsock("%s " P10_ACCOUNT " %s A %s %d", self->numeric, server->numeric , argv[3], hi->registered); } else @@ -1530,7 +1530,7 @@ static CMD_FUNC(cmd_account) if((hi = loc_auth(argv[5], argv[6], argv[4] ))) { /* Return a AC A */ - putsock("%s " P10_ACCOUNT " %s A %s %lu", self->numeric, server->numeric , argv[3], hi->registered); + putsock("%s " P10_ACCOUNT " %s A %s %d", self->numeric, server->numeric , argv[3], hi->registered); } else @@ -2058,7 +2058,7 @@ static CMD_FUNC(cmd_num_gline) else gline_add(origin, argv[3], atoi(argv[4])-now, argv[5], now, 0, 0); } else { - if (argv[5] == "+") + if (!strcmp(argv[5], "+")) gline_add(origin, argv[3], atoi(argv[4])-now, argv[6], now, 0, 0); } return 1; @@ -2072,7 +2072,7 @@ static CMD_FUNC(cmd_num_shun) else shun_add(origin, argv[3], atoi(argv[4])-now, argv[5], now, 0); } else { - if (argv[5] == "+") + if (!strcmp(argv[5], "+")) shun_add(origin, argv[3], atoi(argv[4])-now, argv[6], now, 0); } return 1;