- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Streamline DEBUG_ARRAY, DEBUG_BUFFER, DEBUG_IO, DEBUG_ZIP
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: f547981188a28844068e864dc1ed955ff173d216 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f5479811… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 23:52:08 2014 +0100 Streamline DEBUG_ARRAY, DEBUG_BUFFER, DEBUG_IO, DEBUG_ZIP Change all #define's to follow the form #define DEBUG_xxx {0|1} to disable (0, default) or enable (1) additional debug messages. And somewhat enhance some DEBUG_BUFFER messages. --- src/ngircd/array.c | 16 ++++++++-------- src/ngircd/conn-zip.c | 16 ++++++++-------- src/ngircd/conn.c | 17 ++++++++++------- src/ngircd/io.c | 8 ++++---- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/ngircd/array.c b/src/ngircd/array.c index af66edd..4cc793f 100644 --- a/src/ngircd/array.c +++ b/src/ngircd/array.c @@ -14,6 +14,9 @@ * Functions to dynamically allocate arrays. */ +/* Additionan debug messages related to array handling: 0=off / 1=on */ +#define DEBUG_ARRAY 0 + #include "array.h" #include <assert.h> @@ -21,13 +24,10 @@ #include <string.h> #include <unistd.h> -#ifdef DEBUG_ARRAY +#if DEBUG_ARRAY # include "log.h" #endif -/* Enable more Debug messages in alloc / append / memmove code. */ -/* #define DEBUG_ARRAY */ - #define array_UNUSABLE(x) ( !(x)->mem ) @@ -67,7 +67,7 @@ array_alloc(array * a, size_t size, size_t pos) return NULL; if (a->allocated < alloc) { -#ifdef DEBUG_ARRAY +#if DEBUG_ARRAY Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.", a->allocated, alloc); #endif @@ -168,7 +168,7 @@ array_catb(array * dest, const char *src, size_t len) assert(ptr != NULL); -#ifdef DEBUG_ARRAY +#if DEBUG_ARRAY Log(LOG_DEBUG, "array_catb(): appending %u bytes to array (now %u bytes in array).", len, tmp); @@ -248,7 +248,7 @@ void array_free(array * a) { assert(a != NULL); -#ifdef DEBUG_ARRAY +#if DEBUG_ARRAY Log(LOG_DEBUG, "array_free(): %u bytes free'd (%u bytes still used at time of free()).", a->allocated, a->used); @@ -314,7 +314,7 @@ array_moveleft(array * a, size_t membersize, size_t pos) if (!bytepos) return; /* nothing to do */ -#ifdef DEBUG_ARRAY +#if DEBUG_ARRAY Log(LOG_DEBUG, "array_moveleft(): %u bytes used in array, starting at position %u.", a->used, bytepos); diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c index 5ebb2a0..e21dd34 100644 --- a/src/ngircd/conn-zip.c +++ b/src/ngircd/conn-zip.c @@ -9,6 +9,8 @@ * Please read the file COPYING, README and AUTHORS for more information. */ +#define CONN_MODULE + #include "portab.h" /** @@ -16,13 +18,11 @@ * Connection compression using ZLIB */ -#define CONN_MODULE +/* Additionan debug messages related to ZIP compression: 0=off / 1=on */ +#define DEBUG_ZIP 0 #ifdef ZLIB -/* enable more zlib related debug messages: */ -/* #define DEBUG_ZLIB */ - #include <assert.h> #include <string.h> #include <zlib.h> @@ -141,7 +141,7 @@ Zip_Flush( CONN_ID Idx ) out->next_out = zipbuf; out->avail_out = (uInt)sizeof zipbuf; -#ifdef DEBUG_ZIP +#if DEBUG_ZIP Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d", out->avail_in, out->avail_out); #endif @@ -164,7 +164,7 @@ Zip_Flush( CONN_ID Idx ) assert(out->avail_out <= WRITEBUFFER_SLINK_LEN); zipbuf_used = WRITEBUFFER_SLINK_LEN - out->avail_out; -#ifdef DEBUG_ZIP +#if DEBUG_ZIP Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used); #endif if (!array_catb(&My_Connections[Idx].wbuf, @@ -216,7 +216,7 @@ Unzip_Buffer( CONN_ID Idx ) in->next_out = unzipbuf; in->avail_out = (uInt)sizeof unzipbuf; -#ifdef DEBUG_ZIP +#if DEBUG_ZIP Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d", in->avail_in, in->avail_out); #endif @@ -231,7 +231,7 @@ Unzip_Buffer( CONN_ID Idx ) assert(z_rdatalen >= in->avail_in); in_len = z_rdatalen - in->avail_in; unzipbuf_used = READBUFFER_LEN - in->avail_out; -#ifdef DEBUG_ZIP +#if DEBUG_ZIP Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN, in->avail_out, unzipbuf_used); #endif diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4ed5862..4dfe62f 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -9,8 +9,6 @@ * Please read the file COPYING, README and AUTHORS for more information. */ -#undef DEBUG_BUFFER - #define CONN_MODULE #include "portab.h" @@ -20,6 +18,9 @@ * Connection management */ +/* Additionan debug messages related to buffer handling: 0=off / 1=on */ +#define DEBUG_BUFFER 0 + #include <assert.h> #ifdef PROTOTYPES # include <stdarg.h> @@ -1265,7 +1266,7 @@ Handle_Write( CONN_ID Idx ) return true; } -#ifdef DEBUG_BUFFER +#if DEBUG_BUFFER LogDebug ("Handle_Write() called for connection %d, %ld bytes pending ...", Idx, wdatalen); @@ -1798,10 +1799,6 @@ Handle_Buffer(CONN_ID Idx) return 0; /* error -> connection has been closed */ array_moveleft(&My_Connections[Idx].rbuf, 1, len); -#ifdef DEBUG_BUFFER - LogDebug("Connection %d: %d bytes left in read buffer.", - Idx, array_bytes(&My_Connections[Idx].rbuf)); -#endif #ifdef ZLIB if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) && (array_bytes(&My_Connections[Idx].rbuf) > 0)) { @@ -1824,6 +1821,12 @@ Handle_Buffer(CONN_ID Idx) } #endif } +#if DEBUG_BUFFER + LogDebug("Connection %d: Processed %ld commands (max=%ld), %ld bytes. %ld bytes left in read buffer.", + Idx, i, maxcmd, len_processed, + array_bytes(&My_Connections[Idx].rbuf)); +#endif + return len_processed; } /* Handle_Buffer */ diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 779e749..037c4af 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -17,6 +17,9 @@ * I/O abstraction interface. */ +/* Extra debug messages in event add/delete/callback code: 0=off / 1=on */ +#define DEBUG_IO 0 + #include <assert.h> #include <string.h> #include <sys/types.h> @@ -28,9 +31,6 @@ #include "io.h" #include "log.h" -/* Enables extra debug messages in event add/delete/callback code. */ -/* #define DEBUG_IO */ - typedef struct { #ifdef PROTOTYPES void (*callback)(int, short); @@ -144,7 +144,7 @@ static array io_events; static void io_docallback PARAMS((int fd, short what)); -#ifdef DEBUG_IO +#if DEBUG_IO static void io_debug(const char *s, int fd, int what) {

1 0

Alexander Barton : conn.c: Code cleanup
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: b35f8916a5252182070d0e4502a540e81a3ced90 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b35f8916… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 22:59:58 2014 +0100 conn.c: Code cleanup Reformat and restructure some code, move all SSL related code into one single #ifdef block, for example. --- src/ngircd/conn.c | 431 ++++++++++++++++++++++++----------------------------- 1 file changed, 198 insertions(+), 233 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=b35f…

1 0

Alexander Barton : Xcode: remove imp.h and exp.h from project file
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 3d7aa9f90626bb16ef9db9c9c739ba748976448c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d7aa9f9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 18:07:51 2014 +0100 Xcode: remove imp.h and exp.h from project file These files have been removed from ngIRCd in commit 259c314d, "Remove imp.h and exp.h header files". --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index babe5bc..41ddb52 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -138,8 +138,6 @@ FA322D0D0CEF74B1001761B3 /* resolve.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = resolve.h; sourceTree = "<group>"; }; FA322D100CEF74B1001761B3 /* ansi2knr.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = ansi2knr.1; sourceTree = "<group>"; }; FA322D110CEF74B1001761B3 /* ansi2knr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = ansi2knr.c; sourceTree = "<group>"; }; - FA322D120CEF74B1001761B3 /* exp.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = exp.h; sourceTree = "<group>"; }; - FA322D130CEF74B1001761B3 /* imp.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imp.h; sourceTree = "<group>"; }; FA322D150CEF74B1001761B3 /* portab.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = portab.h; sourceTree = "<group>"; }; FA322D160CEF74B1001761B3 /* portabtest.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = portabtest.c; sourceTree = "<group>"; }; FA322D170CEF74B1001761B3 /* splint.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = splint.h; sourceTree = "<group>"; }; @@ -423,8 +421,6 @@ FA18A64716CEE14900132F66 /* Makefile.ng */, FA322D100CEF74B1001761B3 /* ansi2knr.1 */, FA322D110CEF74B1001761B3 /* ansi2knr.c */, - FA322D120CEF74B1001761B3 /* exp.h */, - FA322D130CEF74B1001761B3 /* imp.h */, FA322D150CEF74B1001761B3 /* portab.h */, FA322D160CEF74B1001761B3 /* portabtest.c */, FA322D170CEF74B1001761B3 /* splint.h */,

1 0

Alexander Barton : Re-add #include's for header files of the C file itself
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: a534e71e8da9a7bab55e7e76358a60dcbd3e25d5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a534e71e… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 18:02:57 2014 +0100 Re-add #include's for header files of the C file itself This partially reverts commit b130b35f4, "Update #include's: remove unused and add missing ones", but fixes the following compiler and analyzer warnings of Apple Xcode 5: "Semantic issue: No previous prototype for function 'yyy'" --- src/ngircd/client-cap.c | 2 ++ src/ngircd/hash.c | 2 ++ src/ngircd/irc-cap.c | 2 ++ src/ngircd/irc-channel.c | 2 ++ src/ngircd/irc-encoding.c | 2 ++ src/ngircd/irc-login.c | 2 ++ src/ngircd/irc-metadata.c | 2 ++ src/ngircd/irc-mode.c | 2 ++ src/ngircd/irc-op.c | 2 ++ src/ngircd/irc-oper.c | 2 ++ src/ngircd/irc-server.c | 2 ++ src/ngircd/match.c | 2 ++ src/ngircd/numeric.c | 2 ++ src/ngircd/op.c | 2 ++ src/ngircd/resolve.c | 2 ++ src/ngircd/sighandlers.c | 2 ++ 16 files changed, 32 insertions(+) diff --git a/src/ngircd/client-cap.c b/src/ngircd/client-cap.c index e6a4eb2..e403da1 100644 --- a/src/ngircd/client-cap.c +++ b/src/ngircd/client-cap.c @@ -23,6 +23,8 @@ #include "conn.h" #include "log.h" +#include "client-cap.h" + GLOBAL int Client_Cap(CLIENT *Client) { diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index 7e5ad9d..cdac5e8 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -22,6 +22,8 @@ #include "defines.h" #include "tool.h" +#include "hash.h" + static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval)); /** diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 61e47f8..bf4c9cd 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -29,6 +29,8 @@ #include "messages.h" #include "parse.h" +#include "irc-cap.h" + /* Local functions */ /** diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 3ea8232..c142243 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -35,6 +35,8 @@ #include "irc-write.h" #include "conf.h" +#include "irc-channel.h" + /** * Part from all channels. * diff --git a/src/ngircd/irc-encoding.c b/src/ngircd/irc-encoding.c index 2c6ac59..7b7121b 100644 --- a/src/ngircd/irc-encoding.c +++ b/src/ngircd/irc-encoding.c @@ -29,6 +29,8 @@ #include "parse.h" #include "tool.h" +#include "irc-encoding.h" + /** * Handler for the IRC+ "CHARCONV" command. * diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 609b187..af165cf 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -34,6 +34,8 @@ #include "irc-macros.h" #include "irc-write.h" +#include "irc-login.h" + static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick, bool InformClient)); diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index 32e0451..efb2201 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -29,6 +29,8 @@ #include "messages.h" #include "parse.h" +#include "irc-metadata.h" + /** * Handler for the IRC+ "METADATA" command. * diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 12a7e30..6a67007 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -31,6 +31,8 @@ #include "messages.h" #include "conf.h" +#include "irc-mode.h" + static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target)); static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 82a78eb..b75841a 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -28,6 +28,8 @@ #include "messages.h" #include "parse.h" +#include "irc-op.h" + /* Local functions */ static bool diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index f896098..1d69a6c 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -37,6 +37,8 @@ #include "messages.h" #include "op.h" +#include "irc-oper.h" + /** * Handle invalid received OPER command. * Log OPER attempt and send error message to client. diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 5ac8810..92186af 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -35,6 +35,8 @@ #include "irc-write.h" #include "op.h" +#include "irc-server.h" + /** * Handler for the IRC "SERVER" command. * diff --git a/src/ngircd/match.c b/src/ngircd/match.c index 3acae90..93ddc0b 100644 --- a/src/ngircd/match.c +++ b/src/ngircd/match.c @@ -22,6 +22,8 @@ #include "defines.h" #include "tool.h" +#include "match.h" + /* * The pattern matching functions [Matche(), Matche_After_Star()] are based * on code of J. Kercheval. Version 1.1 has been released on 1991-03-12 as diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index 5217e14..da863e4 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -31,6 +31,8 @@ #include "log.h" #include "parse.h" +#include "numeric.h" + /** * Announce a channel and its users in the network. */ diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 7b7befb..4a11355 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -26,6 +26,8 @@ #include "messages.h" #include "irc-write.h" +#include "op.h" + /** * Return and log a "no privileges" message. */ diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 01e303e..be41ec8 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -40,6 +40,8 @@ #include "log.h" #include "ng_ipaddr.h" +#include "resolve.h" + static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index e5345db..5cde24b 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -33,6 +33,8 @@ #include "log.h" #include "ngircd.h" +#include "sighandlers.h" + static int signalpipe[2]; static const int signals_catch[] = {

1 0

Alexander Barton : Update copyright notices of recently changed files
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

1 0

Alexander Barton : Update #include's: remove unused and add missing ones
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: b130b35f48d19450240748425e12d21f2c38350f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b130b35f… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 02:28:39 2014 +0100 Update #include's: remove unused and add missing ones The "deheader" tool (<http://www.catb.org/~esr/deheader/>) has been used to find unused #include directives as well as missing ones. Tested on: - A/UX 3.1.1 - ArchLinux (2014-03-17) - Debian GNU/Hurd - Debian GNU/Linux 6.0.9 - Debian GNU/Linux 7.4 - Fedora 20 - FreeBSD 9.2 - OpenBSD 4.8 - OpenBSD 5.1 - OS X 10.9 - Solaris 11 --- src/ipaddr/ng_ipaddr.h | 1 + src/ngircd/array.c | 5 ++++- src/ngircd/channel.c | 3 +-- src/ngircd/class.c | 6 +----- src/ngircd/client-cap.c | 4 ---- src/ngircd/client.c | 4 +--- src/ngircd/conf.c | 6 +----- src/ngircd/conn-encoding.c | 9 ++++----- src/ngircd/conn-func.c | 7 ++++--- src/ngircd/conn.c | 17 ++++++----------- src/ngircd/hash.c | 2 -- src/ngircd/io.c | 2 +- src/ngircd/irc-cap.c | 5 +---- src/ngircd/irc-channel.c | 3 --- src/ngircd/irc-encoding.c | 6 ++---- src/ngircd/irc-info.c | 5 +---- src/ngircd/irc-login.c | 5 +---- src/ngircd/irc-metadata.c | 6 +----- src/ngircd/irc-mode.c | 3 --- src/ngircd/irc-op.c | 4 ---- src/ngircd/irc-oper.c | 4 +--- src/ngircd/irc-server.c | 6 ------ src/ngircd/irc-write.c | 2 -- src/ngircd/irc.c | 8 +++++--- src/ngircd/lists.c | 12 ++++-------- src/ngircd/log.c | 10 ++++------ src/ngircd/login.c | 10 +++++----- src/ngircd/match.c | 1 - src/ngircd/ngircd.c | 6 ------ src/ngircd/numeric.c | 9 ++------- src/ngircd/op.c | 3 --- src/ngircd/pam.c | 17 +++++++---------- src/ngircd/parse.c | 10 ++++------ src/ngircd/proc.c | 4 +++- src/ngircd/resolve.c | 8 ++------ src/ngircd/sighandlers.c | 3 +-- 36 files changed, 68 insertions(+), 148 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=b130…

1 0

Alexander Barton : portab.h: Restructure and clean up code
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 37090a28e8319650e49b4bd3e0518c2f8cbc8ae4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37090a28… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 01:17:30 2014 +0100 portab.h: Restructure and clean up code - Don't use HAVE_SYS_TYPES_H, <sys/types.h> is a required header now. - Streamline check for boolean data types. - Better indent #ifdef constructs. --- src/portab/portab.h | 84 ++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/src/portab/portab.h b/src/portab/portab.h index e30262d..78b6f7e 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2014 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,28 +23,6 @@ # define NDEBUG #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -# define NGIRC_GOT_INTTYPES -#else -# ifdef HAVE_STDINT_H -# include <stdint.h> -# define NGIRC_GOT_INTTYPES -# endif -#endif - -#ifdef HAVE_STDDEF_H -# include <stddef.h> -#endif - -#ifdef HAVE_STDBOOL_H -# include <stdbool.h> -#endif - /* compiler features */ #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)) @@ -65,6 +43,22 @@ /* datatypes */ +#include <sys/types.h> + +#ifdef HAVE_STDDEF_H +# include <stddef.h> +#endif + +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +# define NGIRC_GOT_INTTYPES +#else +# ifdef HAVE_STDINT_H +# include <stdint.h> +# define NGIRC_GOT_INTTYPES +# endif +#endif + #ifndef PROTOTYPES # ifndef signed # define signed @@ -83,26 +77,28 @@ typedef unsigned short UINT16; typedef unsigned int UINT32; #endif -#ifndef HAVE_STDBOOL_H +#ifdef HAVE_STDBOOL_H +# include <stdbool.h> +#else typedef unsigned char bool; -#define true (bool)1 -#define false (bool)0 +# define true (bool)1 +# define false (bool)0 #endif #ifndef NULL -#ifdef PROTOTYPES -# define NULL (void *)0 -#else -# define NULL 0L -#endif +# ifdef PROTOTYPES +# define NULL (void *)0 +# else +# define NULL 0L +# endif #endif #ifdef NeXT -#define S_IRUSR 0000400 /* read permission, owner */ -#define S_IWUSR 0000200 /* write permission, owner */ -#define S_IRGRP 0000040 /* read permission, group */ -#define S_IROTH 0000004 /* read permission, other */ -#define ssize_t int +# define S_IRUSR 0000400 /* read permission, owner */ +# define S_IWUSR 0000200 /* write permission, owner */ +# define S_IRGRP 0000040 /* read permission, group */ +# define S_IROTH 0000004 /* read permission, other */ +# define ssize_t int #endif #undef GLOBAL @@ -111,25 +107,25 @@ typedef unsigned char bool; /* SPLint */ #ifdef S_SPLINT_S -#include "splint.h" +# include "splint.h" #endif /* target constants */ #ifndef HOST_OS -#define HOST_OS "unknown" +# define HOST_OS "unknown" #endif #ifndef HOST_CPU -#define HOST_CPU "unknown" +# define HOST_CPU "unknown" #endif #ifndef HOST_VENDOR -#define HOST_VENDOR "unknown" +# define HOST_VENDOR "unknown" #endif #ifdef __HAIKU__ -#define SINGLE_USER_OS +# define SINGLE_USER_OS #endif /* configure options */ @@ -168,15 +164,15 @@ extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list #endif #ifndef HAVE_GAI_STRERROR -#define gai_strerror(r) "unknown error" +# define gai_strerror(r) "unknown error" #endif #ifndef PACKAGE_NAME -#define PACKAGE_NAME PACKAGE +# define PACKAGE_NAME PACKAGE #endif #ifndef PACKAGE_VERSION -#define PACKAGE_VERSION VERSION +# define PACKAGE_VERSION VERSION #endif #endif

1 0

Alexander Barton : configure[.ng]: <sys/types.h> is a required header file
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 67256f9da1cd43a31e3e703d15fbd4cf75c23923 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=67256f9d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 00:47:45 2014 +0100 configure[.ng]: <sys/types.h> is a required header file ngIRCd already includes <sys/types.h> in a lot of places without checking for its existence (for example in "ngircd.c", "io.c", ...), therefore make it a required header file. --- configure.ng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index 5f85a4d..bd40694 100644 --- a/configure.ng +++ b/configure.ng @@ -155,7 +155,7 @@ AC_HEADER_TIME # Required header files AC_CHECK_HEADERS([ \ fcntl.h netdb.h netinet/in.h stdlib.h string.h \ - strings.h sys/socket.h sys/time.h unistd.h \ + strings.h sys/socket.h sys/time.h sys/types.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) # Optional header files

1 0

Alexander Barton : Remove imp.h and exp.h header files
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

1 0

Alexander Barton : io.c: <sys/time.h> is only needed when using select()
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 7b10a0e4ee64657e138dc9ef3a0d8a68c0e275f0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7b10a0e4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 00:45:07 2014 +0100 io.c: <sys/time.h> is only needed when using select() Only include the <sys/time.h> header when using the select() IO API, it isn't required otherwise. --- src/ngircd/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index dab3043..791190f 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -18,7 +18,6 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <sys/time.h> #include <sys/types.h> #include <unistd.h> #include <fcntl.h> @@ -119,6 +118,7 @@ static bool io_event_change_devpoll(int fd, short what); #endif #ifdef IO_USE_SELECT +#include <sys/time.h> #include "defines.h" /* for conn.h */ #include "proc.h" /* for PROC_STAT (needed by conf.h) */ #include "conn.h" /* for CONN_ID (needed by conf.h) */

1 0