diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | src/botserv.c | 4 | ||||
| -rw-r--r-- | src/chanserv.c | 4 | ||||
| -rw-r--r-- | src/misc.c | 4 | ||||
| -rw-r--r-- | src/proxy.c | 3 | ||||
| -rw-r--r-- | src/servers.c | 4 | ||||
| -rw-r--r-- | src/timeout.c | 2 | ||||
| -rw-r--r-- | version.log | 6 |
8 files changed, 26 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index ab3a2a742..910b5d557 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,6 +2,7 @@ CC=@CC@ INCLUDEDIR=../include ANOPELIBS=@ANOPELIBS@ CFLAGS=@CFLAGS@ +STRICT=-Wall -ansi -pedantic SHELL=/bin/sh SUBDIRS=src BINDEST=@BINDEST@ @@ -16,6 +17,7 @@ RDB=@RDB@ LDFLAGS=@LDFLAGS@ all: language headers build modules +strict: language headers strict_build strict_modules MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \ @@ -30,16 +32,20 @@ build: ( cd $$i; ${MAKE} ${MAKEARGS} all; ) \ done -strict: language headers +strict_build: @for i in $(SUBDIRS); do \ echo "*** Strict Building $$i";\ - ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} -ansi -Wall -pedantic' all; ) \ + ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; ) \ done modules: build (cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} all; ) @echo "*** All done, now (g)make install to install Anope/Modules"; +strict_modules: strict_build + (cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=$(CFLAGS) $(STRICT)' all; ) + @echo "*** All done, now (g)make install to install Anope/Modules"; + language: (cd lang ; $(MAKE) ${MAKEARGS} all language.h ; cp language.h ../include/) diff --git a/src/botserv.c b/src/botserv.c index 28245c7c8..f9a2f6b86 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -608,8 +608,8 @@ void load_bs_dbase(void) { dbFILE *f; int c, ver; - uint16 tmp16; - uint32 tmp32; + int16 tmp16; + int32 tmp32; BotInfo *bi; int failed = 0; diff --git a/src/chanserv.c b/src/chanserv.c index 3a5a7e166..10cde7435 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -634,8 +634,8 @@ void load_cs_dbase(void) ver = get_file_version(f); for (i = 0; i < 256 && !failed; i++) { - uint16 tmp16; - uint32 tmp32; + int16 tmp16; + int32 tmp32; int n_levels; char *s; NickAlias *na; diff --git a/src/misc.c b/src/misc.c index e3bcd899d..49b08e7cd 100644 --- a/src/misc.c +++ b/src/misc.c @@ -910,9 +910,13 @@ char *host_resolve(char *host) char *anopeStrDup(const char *src) { char *ret=NULL; if(src) { +#ifdef __STRICT_ANSI__ if( (ret = (char *)malloc(strlen(src)+1)) ) {; strcpy(ret,src); } +#else + ret = strdup(src); /* this way will prolly be faster, use it if we can */ +#endif } return ret; } diff --git a/src/proxy.c b/src/proxy.c index 2287031ff..5fa38479a 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -263,7 +263,8 @@ static int proxy_connect(unsigned long ip, unsigned short port) fd_set fds; struct timeval tv; - int error, errlen; + int error; + unsigned int errlen; if ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) return -1; diff --git a/src/servers.c b/src/servers.c index 4d6a7f461..33071b625 100644 --- a/src/servers.c +++ b/src/servers.c @@ -195,7 +195,7 @@ Server *findserver(Server * s, const char *name) } } if (debug >= 3) - alog("debug: findserver(%s) -> %p", name, s); + alog("debug: findserver(%s) -> %p", name, (void *) s); return s; } @@ -226,7 +226,7 @@ int anope_check_sync(const char *name) void do_server(const char *source, char *servername, char *hops, char *descript, char *numeric) { - Server *s, *s2; + Server *s; if (debug) { if (!*source) { diff --git a/src/timeout.c b/src/timeout.c index 74f453d99..8f919ec53 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -61,7 +61,7 @@ void check_timeouts(void) } if (debug >= 4) { alog("debug: Running timeout 0x%p (code=0x%p repeat=%d)", - (void *) to, to->code, to->repeat); + (void *) to, (void *) to->code, to->repeat); } to->code(to); if (to->repeat) { diff --git a/version.log b/version.log index 93707d7b1..0dff0c1f5 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="5" -VERSION_BUILD="393" +VERSION_BUILD="394" # $Log$ # +# BUILD : 1.7.5 (394) +# BUGS : N/A +# NOTES : More code tidying, added make strict_modules etc, incase module coders what to use it :) +# # BUILD : 1.7.5 (393) # BUGS : N/A # NOTES : Ultimate3 EOBURST support |