From d4048134afd28a68004e8d296bcf01a9ae1bb5e0 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 27 Jul 2010 02:03:10 -0400 Subject: Some windows fixes from the Anope::string commit --- src/language.cpp | 10 +++++----- src/modulemanager.cpp | 2 +- src/modules.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/language.cpp b/src/language.cpp index 558363f17..f38f69dad 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -97,7 +97,7 @@ static void load_lang(int index, const char *filename) while (--i >= 0) { if (langtexts[index][i]) - delete [] langtexts[index][i]; + free(langtexts[index][i]); // XXX } delete [] langtexts[index]; langtexts[index] = NULL; @@ -111,7 +111,7 @@ static void load_lang(int index, const char *filename) while (--i >= 0) { if (langtexts[index][i]) - delete [] langtexts[index][i]; + free(langtexts[index][i]); // XXX } delete [] langtexts[index]; langtexts[index] = NULL; @@ -123,7 +123,7 @@ static void load_lang(int index, const char *filename) while (--i >= 0) { if (langtexts[index][i]) - delete [] langtexts[index][i]; + free(langtexts[index][i]); // XXX } delete [] langtexts[index]; langtexts[index] = NULL; @@ -139,7 +139,7 @@ static void load_lang(int index, const char *filename) while (--i >= 0) { if (langtexts[index][i]) - delete [] langtexts[index][i]; + free(langtexts[index][i]); } delete [] langtexts[index]; langtexts[index] = NULL; @@ -173,7 +173,7 @@ void lang_sanitize() else strnrepl(tmp, sizeof(tmp), "%R", "/msg "); newstr = strdup(tmp); - delete [] langtexts[i][j]; + free(langtexts[i][j]); // XXX langtexts[i][j] = newstr; } } diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index 30424afef..c533f2770 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -51,7 +51,7 @@ static int moduleCopyFile(const Anope::string &name, Anope::string &output) return MOD_ERR_FILE_IO; } output = tmp_output; - delete [] tmp_output; + free(tmp_output); // XXX Alog(LOG_DEBUG) << "Runtime module location: " << output; diff --git a/src/modules.cpp b/src/modules.cpp index 7f7af6150..600df7d0b 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -288,8 +288,8 @@ void Module::NoticeLang(const Anope::string &source, const User *u, int number, *s++ = '\0'; strscpy(outbuf, t, sizeof(outbuf)); u->SendMessage(source, "%s", outbuf); - } - delete [] buf; + } + free(buf); } else Alog() << this->name << ": INVALID language string call, language: [" << mlang << "], String [" << number << "]"; @@ -326,7 +326,7 @@ void Module::DeleteLanguage(int langNumber) if (this->lang[langNumber].argc) { for (int idx = 0; idx > this->lang[langNumber].argc; ++idx) - delete [] this->lang[langNumber].argv[idx]; + free(this->lang[langNumber].argv[idx]); // XXX delete [] this->lang[langNumber].argv; this->lang[langNumber].argc = 0; } -- cgit