[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-03-13 03:07:51
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-03-13 03:07:41 UTC Modified files: ChangeLog.X3 src/common.h src/proto.h Log message: this never ends... ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.6 x3/ChangeLog.X3:1.7 --- x3/ChangeLog.X3:1.6 Sat Mar 12 18:51:11 2005 +++ x3/ChangeLog.X3 Sat Mar 12 19:07:28 2005 @@ -3,6 +3,8 @@ 2005-03-12 Alex Schumann <ru...@af...> + * src/common.h, src/opserv.h: more SRVX->X3 fixes + * opserv.c: fixed SRVX defines to X3 * src/nickserv.c: Applied patch to bring up to date with @@ -25,5 +27,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.6 $" +#define CVS_VERSION "$Revision: 1.7 $" Index: x3/src/common.h diff -u x3/src/common.h:1.6 x3/src/common.h:1.7 --- x3/src/common.h:1.6 Sat Mar 12 12:13:14 2005 +++ x3/src/common.h Sat Mar 12 19:07:30 2005 @@ -83,21 +83,21 @@ # define free(p) GC_FREE(p) # undef HAVE_STRDUP # undef strdup -#elif defined(WITH_MALLOC_SRVX) +#elif defined(WITH_MALLOC_X3) # undef malloc -# define malloc(n) srvx_malloc(__FILE__, __LINE__, (n)) +# define malloc(n) x3_malloc(__FILE__, __LINE__, (n)) # undef calloc -# define calloc(m,n) srvx_malloc(__FILE__, __LINE__, (m)*(n)) +# define calloc(m,n) x3_malloc(__FILE__, __LINE__, (m)*(n)) # undef realloc -# define realloc(p,n) srvx_realloc(__FILE__, __LINE__, (p), (n)) +# define realloc(p,n) x3_realloc(__FILE__, __LINE__, (p), (n)) # undef free -# define free(p) srvx_free(__FILE__, __LINE__, (p)) +# define free(p) x3_free(__FILE__, __LINE__, (p)) # undef strdup -# define strdup(s) srvx_strdup(__FILE__, __LINE__, (s)) -extern void *srvx_malloc(const char *, unsigned int, size_t); -extern void *srvx_realloc(const char *, unsigned int, void *, size_t); -extern char *srvx_strdup(const char *, unsigned int, const char *); -extern void srvx_free(const char *, unsigned int, void *); +# define strdup(s) x3_strdup(__FILE__, __LINE__, (s)) +extern void *x3_malloc(const char *, unsigned int, size_t); +extern void *x3_realloc(const char *, unsigned int, void *, size_t); +extern char *x3_strdup(const char *, unsigned int, const char *); +extern void x3_free(const char *, unsigned int, void *); # if !defined(NDEBUG) extern void verify(const void *ptr); # define verify(x) verify(x) Index: x3/src/proto.h diff -u x3/src/proto.h:1.4 x3/src/proto.h:1.5 --- x3/src/proto.h:1.4 Sat Mar 12 12:13:14 2005 +++ x3/src/proto.h Sat Mar 12 19:07:31 2005 @@ -23,7 +23,7 @@ /* Warning for those looking at how this code does multi-protocol * support: It's an awful, nasty hack job. It is intended for short - * term use, not long term, since we are already developing srvx2, + * term use, not long term, since we are already developing x3, * which has much nicer interfaces that hide most of the ugly * differences between protocol dialects. */ @@ -234,7 +234,7 @@ #define GENMASK_USENICK 2 #define GENMASK_OMITNICK 4 /* Hurray for Kevin! */ #define GENMASK_BYIP 8 -#define GENMASK_SRVXMASK 16 +#define GENMASK_X3MASK 16 #define GENMASK_NO_HIDING 128 char *generate_hostmask(struct userNode *user, int options); ----------------------- End of diff ----------------------- |