diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-22 01:11:19 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-22 01:11:19 +0000 |
| commit | 16e667a2cecf9492954333fc7949b6636072f941 (patch) | |
| tree | 746164afdc56c0a30dea0f1736c4129c1f1ad422 /src/main.c | |
| parent | 1532aa675f7c28b8ff0061ebc21f374d36d89d65 (diff) | |
Replaced most uses of smalloc and scalloc with new, replaced most uses of free with delete.
NOTE: This build is unstable due to lack of memory zeroing, this will be addresses in a future commit.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1783 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index ff4968ed3..59c63c1fc 100644 --- a/src/main.c +++ b/src/main.c @@ -226,10 +226,12 @@ static void services_shutdown(void) alog("%s", quitmsg); if (started) { ircdproto->SendSquit(ServerName, quitmsg); - Anope_Free(uplink); - Anope_Free(mod_current_buffer); + if (uplink) + delete [] uplink; + if (mod_current_buffer) + delete [] mod_current_buffer; if (ircd->chanmodes) { - Anope_Free(ircd->chanmodes); + delete [] ircd->chanmodes; } u = firstuser(); while (u) { @@ -413,7 +415,7 @@ void sighandler(int signum) #ifndef _WIN32 signum == SIGUSR1 || #endif - !(quitmsg = (const char *)calloc(BUFSIZE, 1))) { + !(quitmsg = new char[BUFSIZE])) { quitmsg = "Out of memory!"; } else { snprintf((char *)quitmsg, BUFSIZE, "Services terminating on signal %d", signum); @@ -472,7 +474,7 @@ int main(int ac, char **av, char **envp) * This fixes bug #589. * -- heinz */ - binary_dir = smalloc(MAX_PATH); + binary_dir = new char[MAX_PATH]; if (!getcwd(binary_dir, MAX_PATH)) { fprintf(stderr, "error: getcwd() error\n"); return -1; @@ -558,7 +560,7 @@ int main(int ac, char **av, char **envp) process(); } else if (i == 0) { int errno_save = errno; - quitmsg = (const char *)scalloc(BUFSIZE, 1); + quitmsg = new char[BUFSIZE]; if (quitmsg) { // Naughty, but oh well. :) snprintf((char *)quitmsg, BUFSIZE, @@ -610,7 +612,7 @@ int main(int ac, char **av, char **envp) #ifdef _WIN32 if (binary_dir) - free(binary_dir); + delete [] binary_dir; #endif return 0; @@ -647,7 +649,7 @@ void do_backtrace(int show_segheader) char *winver; winver = GetWindowsVersion(); alog("Backtrace: not available on Windows"); - alog("Running %S", winver); - free(winver); + alog("Running %s", winver); + delete [] winver; #endif } |