[Dragonmtn-commits] Changes to snowwhite/log.cc

[Mark Loeser]

Index: snowwhite/log.cc
diff -u snowwhite/log.cc:1.1.1.1 snowwhite/log.cc:1.2
--- snowwhite/log.cc:1.1.1.1    Tue Apr  5 20:48:52 2005
+++ snowwhite/log.cc    Sat Apr 23 22:36:38 2005
@@ -8,7 +8,7 @@
  * \skan \mysid
  * \date 1997, 2001
  *
- * $Id: log.cc,v 1.1.1.1 2005/04/05 20:48:52 Halcy0n Exp $
+ * $Id: log.cc,v 1.2 2005/04/23 22:36:38 Halcy0n Exp $
  */
 
 /*
@@ -188,11 +188,11 @@
        va_list ap;
 
        va_start(ap, extra);
-       logx(sender, 0, cmd, target, flags, extra, ap);
+       logx(sender, 0, cmd, target, ap, flags, extra);
        va_end(ap);
 
        va_start(ap, extra);
-       logx(sender, 1, cmd, target, flags, extra, ap);
+       logx(sender, 1, cmd, target, ap, flags, extra);
        va_end(ap);
 }
 
@@ -207,20 +207,20 @@
        va_list ap;
 
        va_start(ap, extra);
-       logx(sender, 1, cmd, target, flags, extra, ap);
+       logx(sender, 1, cmd, target, ap, flags, extra);
        va_end(ap);
 }
 
 void
 SLogfile::logx(UserList *sender, int zb,
                          interp::services_cmd_id cmd,
-                         const char *target,
-                         u_int32_t flags, const char *extra, va_list ap)
+                         const char *target, va_list ap,
+                         u_int32_t flags, const char *extra)
 {
        static char buffer[IRCBUF * 2];
        char senderblock[IRCBUF];
 
-       if (extra && *extra && ap != NULL) {
+       if (extra && *extra) {
                vsnprintf(buffer, IRCBUF, extra, ap);
        } else
                *buffer = '\0';