Change struct Dictionary(*) to rb_dictionary(_\1).

[solanum.git] / ircd / parse.c

diff --git a/ircd/parse.c b/ircd/parse.c
index 92791bf31c9bf68f20039159f98cdee2a5eeccd7..76a3585de14b5d10019063cbe7e9901d9f4d69d0 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -42,11 +42,8 @@
 #include "packet.h"
 #include "s_assert.h"
 
-struct Dictionary *cmd_dict = NULL;
-struct Dictionary *alias_dict = NULL;
-
-/* parv[0] is not used, and parv[LAST] == NULL */
-static char *para[MAXPARA + 2];
+rb_dictionary *cmd_dict = NULL;
+rb_dictionary *alias_dict = NULL;
 
 static void cancel_clients(struct Client *, struct Client *);
 static void remove_unknown(struct Client *, const char *, char *);
@@ -82,7 +79,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 {
        struct Client *from = client_p;
        char *end;
-       int i = 1, res;
+       int res;
        int numeric = 0;
        struct Message *mptr;
        struct MsgBuf msgbuf;
@@ -107,7 +104,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                return;
        }
 
-       if (msgbuf.origin != NULL)
+       if (msgbuf.origin != NULL && IsServer(client_p))
        {
                from = find_client(msgbuf.origin);
 
@@ -249,13 +246,13 @@ handle_command(struct Message *mptr, struct MsgBuf *msgbuf_p, struct Client *cli
 
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Dropping server %s due to (invalid) command '%s'"
-                                    " with only %zu arguments (expecting %d).",
+                                    " with only %zu arguments (expecting %zu).",
                                     client_p->name, mptr->cmd, msgbuf_p->n_para, ehandler.min_para);
                ilog(L_SERVER,
-                    "Insufficient parameters (%zu < %d) for command '%s' from %s.",
+                    "Insufficient parameters (%zu < %zu) for command '%s' from %s.",
                     msgbuf_p->n_para, ehandler.min_para, mptr->cmd, client_p->name);
                snprintf(squitreason, sizeof squitreason,
-                               "Insufficient parameters (%zu < %d) for command '%s'",
+                               "Insufficient parameters (%zu < %zu) for command '%s'",
                                msgbuf_p->n_para, ehandler.min_para, mptr->cmd);
                exit_client(client_p, client_p, client_p, squitreason);
                return (-1);
@@ -281,7 +278,7 @@ handle_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
        ehandler = mptr->handlers[ENCAP_HANDLER];
        handler = ehandler.handler;
 
-       if(parc < ehandler.min_para ||
+       if((size_t)parc < ehandler.min_para ||
           (ehandler.min_para && EmptyString(parv[ehandler.min_para - 1])))
                return;