Should just specify the name here.

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

diff --git a/src/packet.c b/src/packet.c
index 01c8a6482e4fb0c85109f11eba5d9c3635558e9c..fb8dcabb79eacc1edda0a1be2a2833d860fe366e 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "parse.h"
 #include "packet.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hook.h"
 #include "send.h"
 
@@ -181,10 +181,10 @@ flood_recalc(void *unused)
        {
                client_p = ptr->data;
 
-               if(unlikely(IsMe(client_p)))
+               if(rb_unlikely(IsMe(client_p)))
                        continue;
                        
-               if(unlikely(client_p->localClient == NULL))
+               if(rb_unlikely(client_p->localClient == NULL))
                        continue;
                
                if(IsFloodDone(client_p))
@@ -200,7 +200,7 @@ flood_recalc(void *unused)
 
                parse_client_queued(client_p);
                
-               if(unlikely(IsAnyDead(client_p)))
+               if(rb_unlikely(IsAnyDead(client_p)))
                        continue;
 
        }
@@ -252,17 +252,16 @@ read_packet(rb_fde_t * F, void *data)
                 */
                length = rb_read(client_p->localClient->F, readBuf, READBUF_SIZE);
 
-               if(length <= 0)
+               if(length < 0)
                {
                        if(rb_ignore_errno(errno))
-                       {
                                rb_setselect(client_p->localClient->F, 
                                                RB_SELECT_READ, read_packet, client_p);
-                       } else
+                       else
                                error_exit_client(client_p, length);
                        return;
                }
-               if(length == 0)
+               else if(length == 0)
                {
                        error_exit_client(client_p, length);
                        return;