From 12cc6334576c61933383783e94a7b12c818b080b Mon Sep 17 00:00:00 2001 From: rburchell Date: Wed, 18 Feb 2009 23:01:43 +0000 Subject: [PATCH] Add nickalias to build. Also stop sstrdup on args that seem to be NULL, it's getting ripped out anyway. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2109 5417fbe8-f217-4b02-8779-1006273d7864 --- include/account.h | 9 +-------- src/Makefile | 3 ++- src/events.c | 5 +++-- src/nickalias.cpp | 11 +++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 src/nickalias.cpp diff --git a/include/account.h b/include/account.h index 84a8c5b70..ece5176f9 100644 --- a/include/account.h +++ b/include/account.h @@ -27,14 +27,7 @@ class NickCore; class NickAlias { public: - NickAlias() - { - next = prev = NULL; - nick = last_quit = last_realname = last_usermask = NULL; - time_registered = last_seen = 0; - status = 0; - nc = NULL; - } + NickAlias(); NickAlias *next, *prev; char *nick; /* Nickname */ diff --git a/src/Makefile b/src/Makefile index 179268fb3..5320560df 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ OBJS = actions.o base64.o bots.o botserv.o channels.o chanserv.o command.o comm config.o datafiles.o encrypt.o events.o hashcomp.o hostserv.o init.o ircd.o language.o log.o mail.o main.o \ memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \ process.o protocol.o send.o servers.o sessions.o slist.o sockutil.o opertype.o timeout.o users.o module.o modulemanager.o configreader.o \ - wildcard.o nickcore.o + wildcard.o nickcore.o nickalias.o INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \ ../include/pseudo.h ../include/sysconf.h ../include/config.h \ @@ -34,6 +34,7 @@ services: $(OBJS) mod_version $(OBJS): Makefile nickcore.o: nickcore.cpp $(INCLUDES) +nickalias.o: nickalias.cpp $(INCLUDES) actions.o: actions.c $(INCLUDES) base64.o: base64.c $(INCLUDES) bots.o: bots.cpp $(INCLUDES) diff --git a/src/events.c b/src/events.c index f6a773437..966326996 100644 --- a/src/events.c +++ b/src/events.c @@ -35,7 +35,8 @@ void send_event(const char *name, int argc, ...) va_start(va, argc); for (idx = 0; idx < argc; idx++) { a = va_arg(va, char *); - argv[idx] = sstrdup(a); +// argv[idx] = sstrdup(a); + argv[idx] = a; } va_end(va); @@ -48,7 +49,7 @@ void send_event(const char *name, int argc, ...) * Now that the events have seen the message, free it up **/ for (idx = 0; idx < argc; idx++) { - delete [] argv[idx]; + // delete [] argv[idx]; } delete [] argv; } diff --git a/src/nickalias.cpp b/src/nickalias.cpp new file mode 100644 index 000000000..2d8817e0c --- /dev/null +++ b/src/nickalias.cpp @@ -0,0 +1,11 @@ +#include "services.h" + +NickAlias::NickAlias() +{ + next = prev = NULL; + nick = last_quit = last_realname = last_usermask = NULL; + time_registered = last_seen = 0; + status = 0; + nc = NULL; +} +