Author: Kev <klmitch@mit.edu>

Log message:

Actually, this should be the slightest bit more efficient than an else-if
clause.

Status: Compiled
Testing needed: Intuitively correct, but some testing is probably in order

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@246 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 7a8efe41ef068de94bf577429b463528365c38f5..b69bc4760e1319241e2ede48a5888758a41e723c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-06-02  Kevin L. Mitchell  <klmitch@mit.edu>
 
+       * ircd/m_gline.c (ms_gline): actually, this should be the
+       slightest bit more efficient...
+
+       * ircd/m_jupe.c (ms_jupe): actually, this should be the slightest
+       bit more efficient...
+
        * ircd/m_gline.c (ms_gline): inhibit GLINE processing resends
        during netburst
 
@@ -1165,7 +1171,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.140 2000-06-02 22:57:33 kev Exp $
+# $Id: ChangeLog,v 1.141 2000-06-02 23:09:20 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index 4c1ebf6e97e976a9e18df8f4b43b5fe16f593da7..bddf451c6d8e645bbe5c2c92cbb04698918ff937 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -184,9 +184,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
        return gline_activate(cptr, sptr, agline, lastmod, flags);
       else
        return gline_deactivate(cptr, sptr, agline, lastmod, flags);
-    } else if (GlineLastMod(agline) == lastmod)
-      return 0;
-    else if (IsBurstOrBurstAck(cptr)) /* it's in the burst, so don't resynch */
+    } else if (GlineLastMod(agline) == lastmod || IsBurstOrBurstAck(cptr))
       return 0;
     else
       return gline_resend(cptr, agline); /* other server desynched WRT gline */

diff --git a/ircd/m_jupe.c b/ircd/m_jupe.c
index 46479523408e248d6c0a2afb9f512dda49dd6a22..4be685655c6914c88655d01911ee3a4736e9069f 100644 (file)
--- a/ircd/m_jupe.c
+++ b/ircd/m_jupe.c
@@ -165,9 +165,7 @@ int ms_jupe(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
        return jupe_activate(cptr, sptr, ajupe, lastmod, flags);
       else
        return jupe_deactivate(cptr, sptr, ajupe, lastmod, flags);
-    } else if (JupeLastMod(ajupe) == lastmod) /* no changes */
-      return 0;
-    else if (IsBurstOrBurstAck(cptr)) /* it's in the burst, so don't resynch */
+    } else if (JupeLastMod(ajupe) == lastmod || IsBurstOrBurstAck(cptr))
       return 0;
     else
       return jupe_resend(cptr, ajupe); /* other server desynched WRT jupes */