Merge.

diff --cc control/control.c
index e2e5cbccd7dea33ded46bfffa59b9ad305fa4e34,efeddfef51a0a697010aedb7840369414f34a94c..9baa1aa086c04fef7f3da3591e012fb5f67ca650
--- 1/control/control.c
--- 2/control/control.c
+++ b/control/control.c
@@@ -49,8 -49,8 +49,9 @@@ int controllsmod(void *sender, int carg
  int controlrehash(void *sender, int cargc, char **cargv);
  int controlreload(void *sender, int cargc, char **cargv);
  int controlhelpcmd(void *sender, int cargc, char **cargv);
- void handlerehash(int hooknum, void *arg);
 +void controlnoticeopers(flag_t permissionlevel, flag_t noticelevel, char *format, ...) __attribute__ ((format (printf, 3, 4)));
+ void controlnoticeopers(flag_t permissionlevel, flag_t noticelevel, char *format, ...);
+ void handlesignal(int hooknum, void *arg);
  
  void _init() {
    controlcmds=newcommandtree();

diff --cc noperserv/noperserv_hooks.c
Simple merge

diff --cc regexgline/regexgline.c
index 67b1b8418a4f0fcfd65bbe06acabc3123eb7cae4,87b0ae7e63295a4ccbed70c4989531bc63c1c75b..3d8f43164e783f5e0e52106db41131afe124a5cd
--- 1/regexgline/regexgline.c
--- 2/regexgline/regexgline.c
+++ b/regexgline/regexgline.c
@@@ -697,14 -662,10 +697,14 @@@ int rg_glist(void *source, int cargc, c
        pcre_free(hint);
      
    } else {
-     rg_logevent(np, "regexglist", NULL);
 -    rg_logevent(np, "regexglist", "");
 -    controlreply(np, "Mask                      Expires              Set by          Class    Type  Hits  Reason");
++    rg_logevent(np, "regexglist", "%s", "");
 +    controlreply(np, GLINE_HEADER);
      for(rp=rg_list;rp;rp=rp->next)
 -      rg_displaygline(np, rp);
 +      if(rp->mask->length > longest)
 +        longest = rp->mask->length;
 +
 +    for(rp=rg_list;rp;rp=rp->next)
 +      rg_displaygline(np, rp, longest);
    }
  
    controlreply(np, "Done.");

diff --cc xsb/xsb.h
index 077e5924b8919fba9947267deffd61a764368bf5,78b73f2651f681abc68063f9dd3edc8a5408a7a2..c9a173f6dc2049e17bb16f2437a8665e4ec63000
--- 1/xsb/xsb.h
--- 2/xsb/xsb.h
+++ b/xsb/xsb.h
@@@ -5,6 -7,8 +7,8 @@@
  
  void xsb_addcommand(const char *name, const int maxparams, CommandHandler handler);
  void xsb_delcommand(const char *name, CommandHandler handler);
- void xsb_command(const char *command, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
 -void xsb_broadcast(const char *command, server *service, const char *format, ...);
 -void xsb_unicast(const char *command, nick *np, const char *format, ...);
++void xsb_broadcast(const char *command, server *service, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
++void xsb_unicast(const char *command, nick *np, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+ int xsb_isservice(server *service);
  
  #endif