Various constification/g++ fixes..

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1184 5417fbe8-f217-4b02-8779-1006273d7864

9 files changed, 33 insertions, 29 deletions

diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 672d329a6..0787065a4 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -192,7 +192,7 @@ int do_akick(User * u)
     struct c_userlist *cu = NULL;
     struct c_userlist *next;
     User *u2;
-    char *argv[3];
+    const char *argv[3];
     int count = 0;
 
     if (!cmd || (!mask && (!stricmp(cmd, "ADD") || !stricmp(cmd, "STICK")
@@ -348,9 +348,10 @@ int do_akick(User * u)
 
                     do_kick(s_ChanServ, 3, argv);
 
-                    free(argv[2]);
-                    free(argv[1]);
-                    free(argv[0]);
+			// XXX: casting is necessary thanks to strict g++ stuff, really, we should be using std::string here though.
+                    free((void *)argv[2]);
+                    free((void *)argv[1]);
+                    free((void *)argv[0]);
                     count++;
 
                 }
@@ -598,7 +599,7 @@ int do_akick(User * u)
         Channel *c = findchan(ci->name);
         struct c_userlist *cu = NULL;
         struct c_userlist *next;
-        char *argv[3];
+        const char *argv[3];
         int count = 0;
 
         if (!c) {
@@ -617,9 +618,9 @@ int do_akick(User * u)
 
                 do_kick(s_ChanServ, 3, argv);
 
-                free(argv[2]);
-                free(argv[1]);
-                free(argv[0]);
+                free((void *)argv[2]);
+                free((void *)argv[1]);
+                free((void *)argv[0]);
 
                 count++;
             }
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 658fa8809..509790c0e 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -82,7 +82,7 @@ int do_ban(User * u)
     int is_same;
 
     if (!reason) {
-        reason = "Requested";
+        reason = (char *)"Requested"; // XXX unsafe cast -- w00t
     } else {
         if (strlen(reason) > 200)
             reason[200] = '\0';
@@ -131,10 +131,12 @@ int do_ban(User * u)
                 else
                     anope_cmd_kick(whosends(ci), ci->name, u->nick, "%s",
                                    reason);
-                av[0] = ci->name;
-                av[1] = u->nick;
-                av[2] = reason;
-                do_kick(s_ChanServ, 3, av);
+
+		const char *kav[4];
+                kav[0] = ci->name;
+                kav[1] = u->nick;
+                kav[2] = reason;
+                do_kick(s_ChanServ, 3, kav);
             }
         }
 
@@ -190,10 +192,11 @@ int do_ban(User * u)
         else
             anope_cmd_kick(whosends(ci), ci->name, params, "%s", reason);
 
-        av[0] = ci->name;
-        av[1] = params;
-        av[2] = reason;
-        do_kick(s_ChanServ, 3, av);
+	const char *kav[4];
+        kav[0] = ci->name;
+        kav[1] = params;
+        kav[2] = reason;
+        do_kick(s_ChanServ, 3, kav);
     }
     return MOD_CONT;
 }
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 04f5df803..8d3556428 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -377,7 +377,7 @@ int do_clear(User * u)
         }
         notice_lang(s_ChanServ, u, CHAN_CLEARED_VOICES, chan);
     } else if (stricmp(what, "users") == 0) {
-        char *av[3];
+        const char *av[3];
         struct c_userlist *cu, *next;
         char buf[256];
 
@@ -390,9 +390,9 @@ int do_clear(User * u)
             av[2] = sstrdup(buf);
             anope_cmd_kick(whosends(ci), av[0], av[1], av[2]);
             do_kick(s_ChanServ, 3, av);
-            free(av[2]);
-            free(av[1]);
-            free(av[0]);
+            free((void *)av[2]);
+            free((void *)av[1]);
+            free((void *)av[0]);
         }
         notice_lang(s_ChanServ, u, CHAN_CLEARED_USERS, chan);
     } else {
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index bde224a4a..1ca12d75c 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -91,7 +91,7 @@ int do_identify(User * u)
 
         if ((res = enc_check_password(pass, ci->founderpass)) == 1) {
             if (!is_identified(u, ci)) {
-                uc = scalloc(sizeof(*uc), 1);
+                uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
                 uc->next = u->founder_chans;
                 if (u->founder_chans)
                     u->founder_chans->prev = uc;
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 25ce396ff..226086fdf 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -91,7 +91,7 @@ int do_cs_kick(User * u)
             next = uc->next;
             if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
                 && check_access(u, ci, CA_KICKME)) {
-                char *av[3];
+                const char *av[3];
 
                 if ((ci->flags & CI_SIGNKICK)
                     || ((ci->flags & CI_SIGNKICK_LEVEL)
@@ -134,7 +134,7 @@ int do_cs_kick(User * u)
     } else if (is_protected(u2)) {
         notice_lang(s_ChanServ, u, PERMISSION_DENIED);
     } else {
-        char *av[3];
+        const char *av[3];
 
         if ((ci->flags & CI_SIGNKICK)
             || ((ci->flags & CI_SIGNKICK_LEVEL)
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 0dcda53dc..664cb9339 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -146,7 +146,7 @@ int do_list(User * u)
         }
         
         spattern_size = (strlen(pattern) + 2) * sizeof(char);
-        spattern = smalloc(spattern_size);
+        spattern = (char *)smalloc(spattern_size);
         snprintf(spattern, spattern_size, "#%s", pattern);
         
 
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index d8cf4e817..40935ad6e 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -168,7 +168,7 @@ int do_register(User * u)
             notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, tmp_pass);
         }
 
-        uc = scalloc(sizeof(*uc), 1);
+        uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
         uc->next = u->founder_chans;
         uc->prev = NULL;
         if (u->founder_chans)
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 674861578..30684243d 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -116,7 +116,7 @@ int do_suspend(User * u)
 
         if ((c = findchan(ci->name))) {
             struct c_userlist *cu, *next;
-            char *av[3];
+            const char *av[3];
 
             for (cu = c->users; cu; cu = next) {
                 next = cu->next;
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 37d3711fd..fc06397ed 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -313,7 +313,7 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
             if (i < CSAccessMax) {
                 ci->accesscount++;
                 ci->access =
-                    srealloc(ci->access,
+                    (ChanAccess *)srealloc(ci->access,
                              sizeof(ChanAccess) * ci->accesscount);
             } else {
                 notice_lang(s_ChanServ, u, CHAN_XOP_REACHED_LIMIT,
@@ -446,7 +446,7 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
                 ci->accesscount--;
             }
             ci->access =
-                srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
+                (ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
         }
     } else if (stricmp(cmd, "LIST") == 0) {
         int sent_header = 0;