Some windows fixes from the Anope::string commit

5 files changed, 12 insertions, 12 deletions

diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp
index 82ec2daf5..2f40e6912 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/extra/hs_request.cpp
@@ -714,7 +714,7 @@ void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...)
 	{
 		fmt = me->lang[lang].argv[number];
 
-		buf = strdup(fmt);
+		buf = strdup(fmt); // XXX
 		s = buf;
 		while (*s)
 		{
@@ -729,7 +729,7 @@ void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...)
 			va_end(va);
 			memo_send(u, name, buffer, z);
 		}
-		delete [] buf;
+		free(buf); // XXX
 	}
 	else
 		Alog() << me->name << ": INVALID language string call, language: [" << lang << "], String [" << number << "]";
diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp
index a8aee3790..4383d88c4 100644
--- a/modules/protocol/unreal32.cpp
+++ b/modules/protocol/unreal32.cpp
@@ -1299,7 +1299,7 @@ class ProtoUnreal : public Module
 		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_NICKIP, CAPAB_ZIP, CAPAB_TOKEN, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT, CAPAB_CHANMODE, CAPAB_NICKCHARS };
-		for (unsigned i = 0; i < 11; ++i)
+		for (unsigned i = 0; i < 10; ++i)
 			Capab.SetFlag(c[i]);
 
 		AddModes();
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;
 	}