Clean up gline_activate and gline_deactivate.

--HG--
branch : shroudtrusts

diff --git a/glines/glines.c b/glines/glines.c
index 857efcdf92894d6fd8dbdfd154a0eea38b3af97a..8d036c144546d9a01a3365fd74bc6cf1636e5983 100644 (file)
--- a/glines/glines.c
+++ b/glines/glines.c
@@ -107,42 +107,34 @@ gline *findgline(const char *mask) {
   return 0;
 }
 
-gline *gline_activate(gline *agline, time_t lastmod, int propagate) {
+void gline_activate(gline *agline, time_t lastmod, int propagate) {
   time_t now = getnettime();
   agline->flags |= GLINE_ACTIVE;
 
-  if (lastmod) {
+  if (lastmod)
     agline->lastmod = lastmod;
-  } else {
-    if (now <= agline->lastmod)
-      agline->lastmod++;
-    else
-      agline->lastmod = now;
-  }
+  else if (now <= agline->lastmod)
+    agline->lastmod++;
+  else
+    agline->lastmod = now;
 
   if (propagate)
     gline_propagate(agline);
-
-  return agline;
 }
 
-gline *gline_deactivate(gline *agline, time_t lastmod, int propagate) {
+void gline_deactivate(gline *agline, time_t lastmod, int propagate) {
   time_t now = getnettime();
   agline->flags &= ~GLINE_ACTIVE;
 
-  if (lastmod) {
+  if (lastmod)
     agline->lastmod = lastmod;
-  } else {
-    if (now <= agline->lastmod)
-      agline->lastmod++;
-    else
-      agline->lastmod = now;
-  }
+  else if (now <= agline->lastmod)
+    agline->lastmod++;
+  else
+    agline->lastmod = now;
 
   if (propagate)
     gline_propagate(agline);
-
-  return agline;
 }
 
 void gline_propagate(gline *agline) {

diff --git a/glines/glines.h b/glines/glines.h
index 6fb1bf28e9adfc01c92e2ee02759f5cd041459fb..94efec24f1a08f1143c57cbded7e1346776e1c1c 100644 (file)
--- a/glines/glines.h
+++ b/glines/glines.h
@@ -84,8 +84,8 @@ extern gline *glinelist;
 /* glines.c */
 gline *findgline(const char *);
 void gline_propagate(gline *);
-gline *gline_deactivate(gline *, time_t, int);
-gline *gline_activate(gline *agline, time_t lastmod, int propagate);
+void gline_deactivate(gline *, time_t, int);
+void gline_activate(gline *agline, time_t lastmod, int propagate);
 int glineequal(gline *, gline *);
 int gline_match_mask(gline *gla, gline *glb);
 int gline_match_nick(gline *gl, nick *np);