[srvx-commits] CVS: services/src gline.c,1.35,1.36

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32608/src

Modified Files:
	gline.c 
Log Message:
formatting changes to make profiling more accurate


Index: gline.c
===================================================================
RCS file: /cvsroot/srvx/services/src/gline.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** gline.c	22 Jul 2003 16:33:44 -0000	1.35
--- gline.c	26 Sep 2003 15:13:59 -0000	1.36
***************
*** 87,91 ****
          heap_peek(gline_heap, 0, &wraa);
          stopped = ((struct gline*)wraa)->expires;
!         if (stopped > now) break;
          heap_pop(gline_heap);
          free_gline(wraa);
--- 87,92 ----
          heap_peek(gline_heap, 0, &wraa);
          stopped = ((struct gline*)wraa)->expires;
!         if (stopped > now)
!             break;
          heap_pop(gline_heap);
          free_gline(wraa);
***************
*** 116,120 ****
      announce = 1;
  #endif
!     if (announce) irc_ungline(target);
      return res;
  }
--- 117,122 ----
      announce = 1;
  #endif
!     if (announce)
!         irc_ungline(target);
      return res;
  }
***************
*** 132,136 ****
      if (ent) {
          heap_remove_pred(gline_heap, gline_for_p, (char*)target);
!         if (ent->expires < (time_t)(now + duration)) ent->expires = now + duration;
      } else {
          ent = malloc(sizeof(*ent));
--- 134,139 ----
      if (ent) {
          heap_remove_pred(gline_heap, gline_for_p, (char*)target);
!         if (ent->expires < (time_t)(now + duration))
!             ent->expires = now + duration;
      } else {
          ent = malloc(sizeof(*ent));
***************
*** 147,151 ****
  	timeq_add(ent->expires, gline_expire, 0);
      }
!     if (announce) irc_gline(NULL, ent);
      return ent;
  }
--- 150,155 ----
  	timeq_add(ent->expires, gline_expire, 0);
      }
!     if (announce)
!         irc_gline(NULL, ent);
      return ent;
  }
***************
*** 201,205 ****
          issuer = "<unknown>";
      }
!     if (expiration > now) gline_add(issuer, key, expiration - now, reason, issued, 0);
      return 0;
  }
--- 205,210 ----
          issuer = "<unknown>";
      }
!     if (expiration > now)
!         gline_add(issuer, key, expiration - now, reason, issued, 0);
      return 0;
  }