Show hg revision number (serno) in ircd -version.

[irc/rqf/shadowircd.git] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index 7e622408589f4eeee4990411e10c685cb878fb02..79c037e5bc6801353c90bb572b972e7dd503ccdc 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,16 +31,14 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "send.h"
 #include "msg.h"
 #include "s_conf.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "packet.h"
 
@@ -133,7 +131,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
        struct Message *mptr;
 
        s_assert(MyConnect(client_p));
-       s_assert(client_p->localClient->fd >= 0);
+       s_assert(client_p->localClient->F->fd >= 0);
        if(IsAnyDead(client_p))
                return;
 
@@ -163,7 +161,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                        /* didnt find any matching client, issue a kill */
                        if(from == NULL)
                        {
-                               ServerStats->is_unpf++;
+                               ServerStats.is_unpf++;
                                remove_unknown(client_p, sender, pbuffer);
                                return;
                        }
@@ -173,7 +171,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                        /* fake direction, hmm. */
                        if(from->from != client_p)
                        {
-                               ServerStats->is_wrdi++;
+                               ServerStats.is_wrdi++;
                                cancel_clients(client_p, from, pbuffer);
                                return;
                        }
@@ -184,7 +182,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 
        if(*ch == '\0')
        {
-               ServerStats->is_empt++;
+               ServerStats.is_empt++;
                return;
        }
 
@@ -205,7 +203,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
        {
                mptr = NULL;
                numeric = ch;
-               ServerStats->is_num++;
+               ServerStats.is_num++;
                s = ch + 3;     /* I know this is ' ' from above if */
                *s++ = '\0';    /* blow away the ' ', and point s to next part */
        }
@@ -249,7 +247,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                                                   me.name, from->name, ch);
                                }
                        }
-                       ServerStats->is_unco++;
+                       ServerStats.is_unco++;
                        return;
                }
 
@@ -600,10 +598,10 @@ do_numeric(char numeric[], struct Client *client_p, struct Client *source_p, int
                int tl;         /* current length of presently being built string in t */
                for (i = 2; i < (parc - 1); i++)
                {
-                       tl = ircsprintf(t, " %s", parv[i]);
+                       tl = rb_sprintf(t, " %s", parv[i]);
                        t += tl;
                }
-               ircsprintf(t, " :%s", parv[parc - 1]);
+               rb_sprintf(t, " :%s", parv[parc - 1]);
        }
 
        if((target_p = find_client(parv[1])) != NULL)