[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-03-12 20:13:52
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-03-12 20:13:25 UTC Modified files: src/Makefile.am src/Makefile.in src/alloc-slab.c src/chanserv.c src/chanserv.h src/common.h src/conf.c src/conf.h src/dict-splay.c src/dict.h src/gline.c src/gline.h src/global.c src/global.h src/hash.c src/hash.h src/heap.c src/heap.h src/helpfile.c src/helpfile.h src/ioset.c src/ioset.h src/log.c src/log.h src/main.c src/mod-helpserv.c src/mod-memoserv.c src/mod-snoop.c src/mod-sockcheck.c src/modcmd.c src/modcmd.h src/modules.c src/modules.h src/nickserv.c src/nickserv.h src/opserv.c src/opserv.h src/policer.c src/policer.h src/proto-common.c src/proto-p10.c src/proto.h src/recdb.c src/recdb.h src/saxdb.c src/saxdb.h src/sendmail.c src/sendmail.h src/timeq.c src/timeq.h src/tools.c Added files: src/alloc-x3.c Removed files: src/alloc-srvx.c Log message: more srvx->x3 fixes. cvs update -dP to catch renamed files. ---------------------- diff included ---------------------- Index: x3/src/Makefile.am diff -u x3/src/Makefile.am:1.6 x3/src/Makefile.am:1.7 --- x3/src/Makefile.am:1.6 Sun Mar 6 19:51:24 2005 +++ x3/src/Makefile.am Sat Mar 12 12:13:13 2005 @@ -6,7 +6,7 @@ noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help EXTRA_DIST = $(noinst_DATA) -EXTRA_x3_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c +EXTRA_x3_SOURCES = alloc-slab.c alloc-x3.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c x3_LDADD = @MODULE_OBJS@ x3_DEPENDENCIES = @MODULE_OBJS@ x3_SOURCES = \ Index: x3/src/Makefile.in diff -u x3/src/Makefile.in:1.2 x3/src/Makefile.in:1.3 --- x3/src/Makefile.in:1.2 Fri Mar 11 15:09:23 2005 +++ x3/src/Makefile.in Sat Mar 12 12:13:13 2005 @@ -183,7 +183,7 @@ AM_CPPFLAGS = @RX_INCLUDES@ noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help EXTRA_DIST = $(noinst_DATA) -EXTRA_x3_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c +EXTRA_x3_SOURCES = alloc-slab.c alloc-x3.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c x3_LDADD = @MODULE_OBJS@ x3_DEPENDENCIES = @MODULE_OBJS@ x3_SOURCES = \ @@ -288,7 +288,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-slab.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-srvx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-x3.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chanserv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkdb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@ Index: x3/src/alloc-slab.c diff -u x3/src/alloc-slab.c:1.1 x3/src/alloc-slab.c:1.2 --- x3/src/alloc-slab.c:1.1 Mon Feb 21 05:54:54 2005 +++ x3/src/alloc-slab.c Sat Mar 12 12:13:13 2005 @@ -1,7 +1,7 @@ /* alloc-slab.c - Slab debugging allocator * Copyright 2005 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/alloc-srvx.c diff -u x3/src/alloc-srvx.c:1.2 x3/src/alloc-srvx.c:removed --- x3/src/alloc-srvx.c:1.2 Mon Feb 21 05:54:54 2005 +++ x3/src/alloc-srvx.c Sat Mar 12 12:13:25 2005 @@ -1,153 +0,0 @@ -/* alloc-srvx.c - Debug allocation wrapper - * Copyright 2005 srvx Development Team - * - * This file is part of srvx. - * - * srvx is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "common.h" -#include "log.h" - -#undef malloc -#undef free -/* cookies for anybody who recognizes these bytes without help :) */ -#define ALLOC_MAGIC 0x1acf -#define FREE_MAGIC 0xfc1d -const char redzone[] = { '\x03', '\x47', '\x76', '\xc7' }; - -struct alloc_header { - unsigned int file_id : 8; - unsigned int size : 24; - unsigned int line : 16; - unsigned int magic : 16; -}; - -static char file_id_map[256][32]; -static unsigned int file_ids_used; -unsigned long alloc_count, alloc_size; - -static int -file_id_cmp(const void *a_, const void *b_) -{ - return strcmp(a_, b_); -} - -static unsigned int -get_file_id(const char *fname) -{ - void *entry; - - entry = bsearch(fname, file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp); - if (entry) - return ((char*)entry - file_id_map[0]) / sizeof(file_id_map[0]); - strcpy(file_id_map[file_ids_used++], fname); - qsort(file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp); - return file_ids_used - 1; -} - -void * -srvx_malloc(const char *file, unsigned int line, size_t size) -{ - struct alloc_header *block; - block = malloc(sizeof(*block) + size); - block = malloc(sizeof(*block) + size + sizeof(redzone)); - assert(block != NULL); - if (block->magic == ALLOC_MAGIC && block->file_id < file_ids_used) { - /* Only report the error, due to possible false positives. */ - log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%u; allocated by %u:%u/%u).", - block, file, line, size, block->file_id, block->line, block->size); - } - memset(block, 0, sizeof(*block) + size); - memcpy((char*)(block + 1) + size, redzone, sizeof(redzone)); - block->file_id = get_file_id(file); - block->line = line; - block->size = size; - block->magic = ALLOC_MAGIC; - alloc_count++; - alloc_size += size; - return block + 1; -} - -void * -srvx_realloc(const char *file, unsigned int line, void *ptr, size_t size) - struct alloc_header *block = NULL, *newblock; - struct alloc_header *block, *newblock; - } - if (!ptr) - return srvx_malloc(file, line, size); - - verify(ptr); - block = (struct alloc_header *)ptr - 1; - - if (block->size >= size) - return block + 1; - newblock = malloc(sizeof(*newblock) + size); - newblock = malloc(sizeof(*newblock) + size + sizeof(redzone)); - memset(newblock, 0, sizeof(*newblock) + size + sizeof(redzone)); - memset(newblock, 0, sizeof(*newblock)); - memcpy(newblock + 1, block + 1, block->size); - memset((char*)(newblock + 1) + block->size, 0, size - block->size); - memcpy((char*)(newblock + 1) + size, redzone, sizeof(redzone)); - newblock->file_id = get_file_id(file); - newblock->line = line; - newblock->size = size; - newblock->magic = ALLOC_MAGIC; - alloc_count++; - alloc_size += size; - srvx_free(block); - srvx_free(file, line, block + 1); - - return newblock + 1; -} - -char * -srvx_strdup(const char *file, unsigned int line, const char *src) -{ - char *target; - size_t len; - - len = strlen(src) + 1; - target = srvx_malloc(file, line, len); - memcpy(target, src, len); - return target; -} - -srvx_free(const char *file, unsigned int line, void *ptr) -srvx_free(UNUSED_ARG(const char *file), UNUSED_ARG(unsigned int line), void *ptr) -{ - struct alloc_header *block; - size_t size; - - if (!ptr) - return; - verify(ptr); - assert(block->magic == ALLOC_MAGIC); - memset(block, 0, size); - size = block->size; - memset(block + 1, 0xde, size); - block->magic = FREE_MAGIC; - free(block); - alloc_size -= size - sizeof(*block); - (void)file; (void)line; -} - -void -verify(const void *ptr) -{ - const struct alloc_header *header; - if (!ptr) - return; - header = (const struct alloc_header*)ptr - 1; - assert(header->magic == ALLOC_MAGIC); - assert(!memcmp((char*)(header + 1) + header->size, redzone, sizeof(redzone))); -} - Index: x3/src/alloc-x3.c diff -u /dev/null x3/src/alloc-x3.c:1.1 --- /dev/null Sat Mar 12 12:13:25 2005 +++ x3/src/alloc-x3.c Sat Mar 12 12:13:14 2005 @@ -0,0 +1,153 @@ +/* alloc-x3.c - Debug allocation wrapper + * Copyright 2005 srvx Development Team + * + * This file is part of x3. + * + * srvx is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "common.h" +#include "log.h" + +#undef malloc +#undef free +/* cookies for anybody who recognizes these bytes without help :) */ +#define ALLOC_MAGIC 0x1acf +#define FREE_MAGIC 0xfc1d +const char redzone[] = { '\x03', '\x47', '\x76', '\xc7' }; + +struct alloc_header { + unsigned int file_id : 8; + unsigned int size : 24; + unsigned int line : 16; + unsigned int magic : 16; +}; + +static char file_id_map[256][32]; +static unsigned int file_ids_used; +unsigned long alloc_count, alloc_size; + +static int +file_id_cmp(const void *a_, const void *b_) +{ + return strcmp(a_, b_); +} + +static unsigned int +get_file_id(const char *fname) +{ + void *entry; + + entry = bsearch(fname, file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp); + if (entry) + return ((char*)entry - file_id_map[0]) / sizeof(file_id_map[0]); + strcpy(file_id_map[file_ids_used++], fname); + qsort(file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp); + return file_ids_used - 1; +} + +void * +x3_malloc(const char *file, unsigned int line, size_t size) +{ + struct alloc_header *block; + block = malloc(sizeof(*block) + size); + block = malloc(sizeof(*block) + size + sizeof(redzone)); + assert(block != NULL); + if (block->magic == ALLOC_MAGIC && block->file_id < file_ids_used) { + /* Only report the error, due to possible false positives. */ + log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%u; allocated by %u:%u/%u).", + block, file, line, size, block->file_id, block->line, block->size); + } + memset(block, 0, sizeof(*block) + size); + memcpy((char*)(block + 1) + size, redzone, sizeof(redzone)); + block->file_id = get_file_id(file); + block->line = line; + block->size = size; + block->magic = ALLOC_MAGIC; + alloc_count++; + alloc_size += size; + return block + 1; +} + +void * +x3_realloc(const char *file, unsigned int line, void *ptr, size_t size) + struct alloc_header *block = NULL, *newblock; + struct alloc_header *block, *newblock; + } + if (!ptr) + return x3_malloc(file, line, size); + + verify(ptr); + block = (struct alloc_header *)ptr - 1; + + if (block->size >= size) + return block + 1; + newblock = malloc(sizeof(*newblock) + size); + newblock = malloc(sizeof(*newblock) + size + sizeof(redzone)); + memset(newblock, 0, sizeof(*newblock) + size + sizeof(redzone)); + memset(newblock, 0, sizeof(*newblock)); + memcpy(newblock + 1, block + 1, block->size); + memset((char*)(newblock + 1) + block->size, 0, size - block->size); + memcpy((char*)(newblock + 1) + size, redzone, sizeof(redzone)); + newblock->file_id = get_file_id(file); + newblock->line = line; + newblock->size = size; + newblock->magic = ALLOC_MAGIC; + alloc_count++; + alloc_size += size; + x3_free(block); + x3_free(file, line, block + 1); + + return newblock + 1; +} + +char * +x3_strdup(const char *file, unsigned int line, const char *src) +{ + char *target; + size_t len; + + len = strlen(src) + 1; + target = x3_malloc(file, line, len); + memcpy(target, src, len); + return target; +} + +x3_free(const char *file, unsigned int line, void *ptr) +x3_free(UNUSED_ARG(const char *file), UNUSED_ARG(unsigned int line), void *ptr) +{ + struct alloc_header *block; + size_t size; + + if (!ptr) + return; + verify(ptr); + assert(block->magic == ALLOC_MAGIC); + memset(block, 0, size); + size = block->size; + memset(block + 1, 0xde, size); + block->magic = FREE_MAGIC; + free(block); + alloc_size -= size - sizeof(*block); + (void)file; (void)line; +} + +void +verify(const void *ptr) +{ + const struct alloc_header *header; + if (!ptr) + return; + header = (const struct alloc_header*)ptr - 1; + assert(header->magic == ALLOC_MAGIC); + assert(!memcmp((char*)(header + 1) + header->size, redzone, sizeof(redzone))); +} + Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.14 x3/src/chanserv.c:1.15 --- x3/src/chanserv.c:1.14 Mon Feb 21 05:54:54 2005 +++ x3/src/chanserv.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* chanserv.c - Channel service bot * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/chanserv.h diff -u x3/src/chanserv.h:1.6 x3/src/chanserv.h:1.7 --- x3/src/chanserv.h:1.6 Mon Feb 21 05:54:54 2005 +++ x3/src/chanserv.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* chanserv.h - Channel service bot * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/common.h diff -u x3/src/common.h:1.5 x3/src/common.h:1.6 --- x3/src/common.h:1.5 Mon Feb 21 05:54:54 2005 +++ x3/src/common.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* common.h - Common functions/includes * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/conf.c diff -u x3/src/conf.c:1.1.1.1 x3/src/conf.c:1.2 --- x3/src/conf.c:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/conf.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* conf.c - Config file reader * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/conf.h diff -u x3/src/conf.h:1.1.1.1 x3/src/conf.h:1.2 --- x3/src/conf.h:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/conf.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* conf.h - Config file reader * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/dict-splay.c diff -u x3/src/dict-splay.c:1.3 x3/src/dict-splay.c:1.4 --- x3/src/dict-splay.c:1.3 Sun Jan 30 17:41:29 2005 +++ x3/src/dict-splay.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* dict-splay.c - Abstract dictionary type * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/dict.h diff -u x3/src/dict.h:1.1.1.1 x3/src/dict.h:1.2 --- x3/src/dict.h:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/dict.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* dict.h - Abstract dictionary type * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/gline.c diff -u x3/src/gline.c:1.1.1.1 x3/src/gline.c:1.2 --- x3/src/gline.c:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/gline.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* gline.c - Gline database * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/gline.h diff -u x3/src/gline.h:1.1.1.1 x3/src/gline.h:1.2 --- x3/src/gline.h:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/gline.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* gline.h - Gline database * Copyright 2001-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/global.c diff -u x3/src/global.c:1.2 x3/src/global.c:1.3 --- x3/src/global.c:1.2 Tue Aug 24 17:32:01 2004 +++ x3/src/global.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* global.c - Global notice service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/global.h diff -u x3/src/global.h:1.1.1.1 x3/src/global.h:1.2 --- x3/src/global.h:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/global.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* global.h - Global notice service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/hash.c diff -u x3/src/hash.c:1.7 x3/src/hash.c:1.8 --- x3/src/hash.c:1.7 Mon Feb 21 05:54:54 2005 +++ x3/src/hash.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* hash.c - IRC network state database * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/hash.h diff -u x3/src/hash.h:1.7 x3/src/hash.h:1.8 --- x3/src/hash.h:1.7 Sun Oct 24 11:18:10 2004 +++ x3/src/hash.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* hash.h - IRC network state database * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/heap.c diff -u x3/src/heap.c:1.1.1.1 x3/src/heap.c:1.2 --- x3/src/heap.c:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/heap.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* heap.c - Abstract heap type * Copyright 2000-2002 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/heap.h diff -u x3/src/heap.h:1.1.1.1 x3/src/heap.h:1.2 --- x3/src/heap.h:1.1.1.1 Thu Jun 3 10:13:59 2004 +++ x3/src/heap.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* heap.h - Abstract heap type * Copyright 2000-2001 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/helpfile.c diff -u x3/src/helpfile.c:1.2 x3/src/helpfile.c:1.3 --- x3/src/helpfile.c:1.2 Tue Aug 24 17:32:02 2004 +++ x3/src/helpfile.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* helpfile.c - Help file loading and display * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/helpfile.h diff -u x3/src/helpfile.h:1.2 x3/src/helpfile.h:1.3 --- x3/src/helpfile.h:1.2 Tue Aug 24 17:32:02 2004 +++ x3/src/helpfile.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* helpfile.h - Help file loading and display * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/ioset.c diff -u x3/src/ioset.c:1.1.1.1 x3/src/ioset.c:1.2 --- x3/src/ioset.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/ioset.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* ioset.h - srvx event loop * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/ioset.h diff -u x3/src/ioset.h:1.1.1.1 x3/src/ioset.h:1.2 --- x3/src/ioset.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/ioset.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* ioset.h - srvx event loop * Copyright 2002-2003 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/log.c diff -u x3/src/log.c:1.4 x3/src/log.c:1.5 --- x3/src/log.c:1.4 Mon Feb 21 05:54:54 2005 +++ x3/src/log.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* log.c - Diagnostic and error logging * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/log.h diff -u x3/src/log.h:1.2 x3/src/log.h:1.3 --- x3/src/log.h:1.2 Wed Dec 8 12:28:54 2004 +++ x3/src/log.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* log.h - Diagnostic and error logging * Copyright 2000-2003 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/main.c diff -u x3/src/main.c:1.3 x3/src/main.c:1.4 --- x3/src/main.c:1.3 Sun Mar 6 19:51:24 2005 +++ x3/src/main.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* main.c - srvx * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/mod-helpserv.c diff -u x3/src/mod-helpserv.c:1.5 x3/src/mod-helpserv.c:1.6 --- x3/src/mod-helpserv.c:1.5 Sun Mar 6 19:51:24 2005 +++ x3/src/mod-helpserv.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* mod-helpserv.c - Support Helper assistant service * Copyright 2002-2003 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/mod-memoserv.c diff -u x3/src/mod-memoserv.c:1.1.1.1 x3/src/mod-memoserv.c:1.2 --- x3/src/mod-memoserv.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/mod-memoserv.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* mod-memoserv.c - MemoServ module for srvx * Copyright 2003-2004 Martijn Smit and srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/mod-snoop.c diff -u x3/src/mod-snoop.c:1.4 x3/src/mod-snoop.c:1.5 --- x3/src/mod-snoop.c:1.4 Sun Oct 24 11:19:00 2004 +++ x3/src/mod-snoop.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* mod-snoop.c - User surveillance module (per pomac's spec) * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/mod-sockcheck.c diff -u x3/src/mod-sockcheck.c:1.2 x3/src/mod-sockcheck.c:1.3 --- x3/src/mod-sockcheck.c:1.2 Sun Jan 30 17:41:29 2005 +++ x3/src/mod-sockcheck.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* mod-sockcheck.c - insecure proxy checking * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/modcmd.c diff -u x3/src/modcmd.c:1.9 x3/src/modcmd.c:1.10 --- x3/src/modcmd.c:1.9 Sun Mar 6 19:51:24 2005 +++ x3/src/modcmd.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* modcmd.c - Generalized module command support * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/modcmd.h diff -u x3/src/modcmd.h:1.1.1.1 x3/src/modcmd.h:1.2 --- x3/src/modcmd.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/modcmd.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* modcmd.h - Generalized module command support * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/modules.c diff -u x3/src/modules.c:1.1.1.1 x3/src/modules.c:1.2 --- x3/src/modules.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/modules.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* modules.c - Compiled-in module support * Copyright 2002-2003 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/modules.h diff -u x3/src/modules.h:1.1.1.1 x3/src/modules.h:1.2 --- x3/src/modules.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/modules.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* modules.h - Compiled-in module support * Copyright 2002 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/nickserv.c diff -u x3/src/nickserv.c:1.17 x3/src/nickserv.c:1.18 --- x3/src/nickserv.c:1.17 Sun Mar 6 20:12:33 2005 +++ x3/src/nickserv.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* nickserv.c - Nick/authentication service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/nickserv.h diff -u x3/src/nickserv.h:1.4 x3/src/nickserv.h:1.5 --- x3/src/nickserv.h:1.4 Sun Oct 24 11:18:10 2004 +++ x3/src/nickserv.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* nickserv.h - Nick/authentiction service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/opserv.c diff -u x3/src/opserv.c:1.10 x3/src/opserv.c:1.11 --- x3/src/opserv.c:1.10 Mon Feb 21 05:54:54 2005 +++ x3/src/opserv.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* opserv.c - IRC Operator assistance service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/opserv.h diff -u x3/src/opserv.h:1.1.1.1 x3/src/opserv.h:1.2 --- x3/src/opserv.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/opserv.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* opserv.h - IRC Operator assistant service * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/policer.c diff -u x3/src/policer.c:1.1.1.1 x3/src/policer.c:1.2 --- x3/src/policer.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/policer.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* policer.c - Leaky bucket * Copyright 2000-2002 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/policer.h diff -u x3/src/policer.h:1.1.1.1 x3/src/policer.h:1.2 --- x3/src/policer.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/policer.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* policer.h - Leaky bucket * Copyright 2000-2001 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/proto-common.c diff -u x3/src/proto-common.c:1.8 x3/src/proto-common.c:1.9 --- x3/src/proto-common.c:1.8 Sun Mar 6 19:51:24 2005 +++ x3/src/proto-common.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* proto-common.c - common IRC protocol parsing/sending support * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/proto-p10.c diff -u x3/src/proto-p10.c:1.11 x3/src/proto-p10.c:1.12 --- x3/src/proto-p10.c:1.11 Mon Feb 21 05:54:54 2005 +++ x3/src/proto-p10.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* proto-p10.c - IRC protocol output * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/proto.h diff -u x3/src/proto.h:1.3 x3/src/proto.h:1.4 --- x3/src/proto.h:1.3 Sun Oct 24 11:18:10 2004 +++ x3/src/proto.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* proto.h - IRC protocol output * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/recdb.c diff -u x3/src/recdb.c:1.1.1.1 x3/src/recdb.c:1.2 --- x3/src/recdb.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/recdb.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* recdb.c - recursive/record database implementation * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/recdb.h diff -u x3/src/recdb.h:1.1.1.1 x3/src/recdb.h:1.2 --- x3/src/recdb.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/recdb.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* recdb.h - recursive/record database implementation * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/saxdb.c diff -u x3/src/saxdb.c:1.1.1.1 x3/src/saxdb.c:1.2 --- x3/src/saxdb.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/saxdb.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* saxdb.c - srvx database manager * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/saxdb.h diff -u x3/src/saxdb.h:1.1.1.1 x3/src/saxdb.h:1.2 --- x3/src/saxdb.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/saxdb.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* saxdb.h - srvx database manager * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/sendmail.c diff -u x3/src/sendmail.c:1.1.1.1 x3/src/sendmail.c:1.2 --- x3/src/sendmail.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/sendmail.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* sendmail.c - mail sending utilities * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/sendmail.h diff -u x3/src/sendmail.h:1.1.1.1 x3/src/sendmail.h:1.2 --- x3/src/sendmail.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/sendmail.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* sendmail.h - mail sending utilities * Copyright 2002 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/timeq.c diff -u x3/src/timeq.c:1.1.1.1 x3/src/timeq.c:1.2 --- x3/src/timeq.c:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/timeq.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* timeq.c - time-based event queue * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/timeq.h diff -u x3/src/timeq.h:1.1.1.1 x3/src/timeq.h:1.2 --- x3/src/timeq.h:1.1.1.1 Thu Jun 3 10:14:00 2004 +++ x3/src/timeq.h Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* timeq.h - time-based event queue * Copyright 2000-2002 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: x3/src/tools.c diff -u x3/src/tools.c:1.9 x3/src/tools.c:1.10 --- x3/src/tools.c:1.9 Sun Jan 30 18:11:36 2005 +++ x3/src/tools.c Sat Mar 12 12:13:14 2005 @@ -1,7 +1,7 @@ /* tools.c - miscellaneous utility functions * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ----------------------- End of diff ----------------------- |