m_stats: z: remove unnecessary casting and fix format strings

[solanum.git] / extensions / chm_insecure.c

diff --git a/extensions/chm_insecure.c b/extensions/chm_insecure.c
index 14037e821e9495c2ca6dc4f17e6528ccffcdc2ec..177273ba2637bc14ee68fc55282ba041142ee6e8 100644 (file)
--- a/extensions/chm_insecure.c
+++ b/extensions/chm_insecure.c
@@ -14,10 +14,10 @@ static const char chm_insecure_desc[] =
        "Adds channel mode +U that allows non-SSL users to join a channel, "
        "disallowing them by default";
 
-static void h_can_join(hook_data_channel *);
+static void h_can_join(void *);
 
 mapi_hfn_list_av1 sslonly_hfnlist[] = {
-       { "can_join", (hookfn) h_can_join },
+       { "can_join", h_can_join },
        { NULL, NULL }
 };
 
@@ -43,12 +43,13 @@ _moddeinit(void)
 DECLARE_MODULE_AV2(chm_insecure, _modinit, _moddeinit, NULL, NULL, sslonly_hfnlist, NULL, NULL, chm_insecure_desc);
 
 static void
-h_can_join(hook_data_channel *data)
+h_can_join(void *data_)
 {
+       hook_data_channel *data = data_;
        struct Client *source_p = data->client;
        struct Channel *chptr = data->chptr;
 
-       if(!(chptr->mode.mode & mymode) && !IsSSLClient(source_p)) {
+       if(!(chptr->mode.mode & mymode) && !IsSecureClient(source_p)) {
                /* XXX This is equal to ERR_THROTTLE */
                sendto_one_numeric(source_p, 480, "%s :Cannot join channel (-U) - SSL/TLS required", chptr->chname);
                data->approved = ERR_CUSTOM;