* Removed all that EGG_VARARGS crap

svn: 638

src/botmsg.c

@@ -20,6 +20,7 @@
 #include "botnet.h"
 #include "tandem.h"
 #include "core_binds.h"
+#include <stdarg.h>
 
 extern struct dcc_t	*dcc;
 extern int		 dcc_total, tands;
@@ -105,13 +106,13 @@ char *unsigned_int_to_base10(unsigned int val)
   return buf_base10 + i;
 }
 
-int simple_sprintf EGG_VARARGS_DEF(char *,arg1)
+int simple_sprintf (char *buf, ...)
 {
-  char *buf, *format, *s;
+  char *format, *s;
   int c = 0, i;
   va_list va;
-
-  buf = EGG_VARARGS_START(char *, arg1, va);
+  
+  va_start(va, buf);
   format = va_arg(va, char *);
 
   while (*format && c < 1023) {
@@ -281,14 +282,14 @@ void botnet_send_pong(int idx)
   tputs(dcc[idx].sock, "po\n", 3);
 }
 
-void botnet_send_priv EGG_VARARGS_DEF(int, arg1)
+void botnet_send_priv (int idx, ...)
 {
-  int idx, l;
+  int l;
   char *from, *to, *tobot, *format;
   char tbuf[1024];
   va_list va;
 
-  idx = EGG_VARARGS_START(int, arg1, va);
+  va_start(va, idx);
   from = va_arg(va, char *);
   to = va_arg(va, char *);
   tobot = va_arg(va, char *);

src/botmsg.h

@@ -10,8 +10,8 @@ void botnet_send_cfg_broad(int idx, struct cfg_entry *entry);
 void putbot(char *, char *);
 void putallbots(char *);
 int add_note(char *, char *, char *, int, int);
-int simple_sprintf EGG_VARARGS(char *, arg1);
-void tandout_but EGG_VARARGS(int, arg1);
+int simple_sprintf (char *, ...);
+void tandout_but (int, ...);
 char *int_to_base10(int);
 char *unsigned_int_to_base10(unsigned int);
 char *int_to_base64(unsigned int);

src/crypt.c

@@ -10,6 +10,7 @@
 #include "crypt.h"
 #include "salt.h"
 #include "misc.h"
+#include <stdarg.h>
 
 #define CRYPT_BLOCKSIZE AES_BLOCK_SIZE
 #define CRYPT_KEYBITS 256
@@ -165,17 +166,17 @@ void encrypt_pass(char *s1, char *s2)
   free(tmp);
 }
 
-int lfprintf EGG_VARARGS_DEF(FILE *, arg1)
+int lfprintf (FILE *stream, ...)
 {
   va_list va;
   char buf[8192], *ln, *nln, *tmp, *format;
   int res;
-  FILE *stream;
 
-  stream = EGG_VARARGS_START(FILE *, arg1, va);
+  va_start(va, stream);
   format = va_arg(va, char *);
-
   egg_vsnprintf(buf, sizeof buf, format, va);
+  va_end(va);
+
   ln = buf;
   while ((ln) && (ln[0])) {
     nln = strchr(ln, '\n');

src/crypt.h

@@ -8,7 +8,7 @@ char *decrypt_string(const char *, char *);
 void encrypt_pass(char *, char *);
 char *cryptit (char *);
 char *decryptit (char *);
-int lfprintf EGG_VARARGS(FILE *, arg1);
+int lfprintf (FILE *, ...);
 void EncryptFile(char *, char *);
 void DecryptFile(char *, char *);
 #endif /* !MAKING_MODS */

src/dccutil.c

@@ -21,6 +21,7 @@
 #include "modules.h"
 #include "tandem.h"
 #include "core_binds.h"
+#include <stdarg.h>
 
 extern struct dcc_t	*dcc;
 extern int		 dcc_total, max_dcc, dcc_flood_thr, backgrd, MAXSOCKS, tands;
@@ -78,14 +79,14 @@ char *add_cr(char *buf)
 
 extern void (*qserver) (int, char *, int);
 
-void dprintf EGG_VARARGS_DEF(int, arg1)
+void dprintf (int idx, ...)
 {
   static char buf[1024];
   char *format; 
-  int idx, len;
+  int len;
   va_list va;
 
-  idx = EGG_VARARGS_START(int, arg1, va);
+  va_start(va, idx);
   format = va_arg(va, char *);
   egg_vsnprintf(buf, 1023, format, va);
   va_end(va);
@@ -202,14 +203,13 @@ void dprintf EGG_VARARGS_DEF(int, arg1)
   }
 }
 
-void chatout EGG_VARARGS_DEF(char *, arg1)
+void chatout (char *format, ...)
 {
   int i, len;
-  char *format;
   char s[601];
   va_list va;
 
-  format = EGG_VARARGS_START(char *, arg1, va);
+  va_start(va, format);
   egg_vsnprintf(s, 511, format, va);
   va_end(va);
   len = strlen(s);
@@ -226,14 +226,14 @@ void chatout EGG_VARARGS_DEF(char *, arg1)
 
 /* Print to all on this channel but one.
  */
-void chanout_but EGG_VARARGS_DEF(int, arg1)
+void chanout_but (int x, ...)
 {
-  int i, x, chan, len;
+  int i, chan, len;
   char *format;
   char s[601];
   va_list va;
 
-  x = EGG_VARARGS_START(int, arg1, va);
+  va_start(va, x);
   chan = va_arg(va, int);
   format = va_arg(va, char *);
   egg_vsnprintf(s, 511, format, va);

src/dccutil.h

@@ -8,12 +8,12 @@
 #endif
 
 #ifndef MAKING_MODS
-void dprintf EGG_VARARGS(int, arg1);
-void chatout EGG_VARARGS(char *, arg1);
+void dprintf (int, ...);
+void chatout (char *, ...);
 extern void (*shareout) ();
 extern void (*sharein) (int, char *);
 extern void (*shareupdatein) (int, char *);
-void chanout_but EGG_VARARGS(int, arg1);
+void chanout_but (int, ...);
 void dcc_chatter(int);
 void lostdcc(int);
 void makepass(char *);

src/debug.c

@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
-
+#include <stdarg.h>
 
 extern int 		 sdebug, backgrd, do_restart;
 extern char		 tempdir[], origbotname[], ver[];
@@ -68,14 +68,13 @@ void init_debug()
 
 int     sdebug = 0;             /* enable debug output? */
 
-void sdprintf EGG_VARARGS_DEF(char *, arg1)
+void sdprintf (char *format, ...)
 {
   if (sdebug) {
-    char *format;
     char s[2001];
     va_list va;
 
-    format = EGG_VARARGS_START(char *, arg1, va);
+    va_start(va, format);
     egg_vsnprintf(s, 2000, format, va);
     va_end(va);
     if (!backgrd)

src/debug.h

@@ -2,7 +2,7 @@
 #define _DEBUG_H
 
 #ifndef MAKING_MODS
-void sdprintf EGG_VARARGS(char *, arg1);
+void sdprintf (char *, ...);
 void init_signals();
 #endif /* !MAKING_MODS */
 

src/eggmain.h

@@ -14,11 +14,6 @@
 #include "garble.h"
 
 
-#include <stdarg.h>
-#define EGG_VARARGS(type, name) (type name, ...)
-#define EGG_VARARGS_DEF(type, name) (type name, ...)
-#define EGG_VARARGS_START(type, name, list) (va_start(list, name), name)
-
 
 #include <stdio.h>
 #include <stdlib.h>

src/misc.c

@@ -45,6 +45,7 @@
 #include <signal.h>
 #include <sys/utsname.h>
 #include "stat.h"
+#include <stdarg.h>
 
 extern struct userrec 	*userlist;
 extern struct dcc_t	*dcc;
@@ -560,10 +561,10 @@ int getting_users()
 /* Log something
  * putlog(level,channel_name,format,...);
  */
-void putlog EGG_VARARGS_DEF(int, arg1)
+void putlog(int type, char *chname, char *format, ...)
 {
-  int i, type, tsl = 0, dohl = 0; //hl
-  char *format, *chname, s[LOGLINELEN], *out = NULL, stamp[34], buf2[LOGLINELEN]; 
+  int i, tsl = 0, dohl = 0; //hl
+  char s[LOGLINELEN], *out = NULL, stamp[34], buf2[LOGLINELEN]; 
   va_list va;
 #ifdef HUB
   time_t now2 = time(NULL);
@@ -572,9 +573,7 @@ void putlog EGG_VARARGS_DEF(int, arg1)
 #ifdef LEAF
   t = 0;
 #endif /* LEAF */
-  type = EGG_VARARGS_START(int, arg1, va);
-  chname = va_arg(va, char *);
-  format = va_arg(va, char *);
+  va_start(va, format);
 //The putlog should not be broadcast over bots, @ is *.
   if ((chname[0] == '*'))
     dohl = 1;
@@ -600,6 +599,7 @@ void putlog EGG_VARARGS_DEF(int, arg1)
    */
 
   egg_vsnprintf(out, LOGLINEMAX - tsl, format, va);
+  va_end(va);
 
   out[LOGLINEMAX - tsl] = 0;
 
@@ -644,7 +644,6 @@ void putlog EGG_VARARGS_DEF(int, arg1)
       out += tsl;
     dprintf(DP_STDERR, "%s", s);
   }
-  va_end(va);
 }
 
 char *extracthostname(char *hostmask)

src/misc.h

@@ -34,7 +34,7 @@ int updatebin(int, char *, int);
 int shell_exec(char * cmdline, char * input, char ** output, char ** erroutput);
 int egg_strcatn(char *dst, const char *src, size_t max);
 int my_strcpy(char *, char *);
-void putlog EGG_VARARGS(int, arg1);
+void putlog (int, char *, char *, ...);
 int ischanhub();
 int dovoice(struct chanset_t *);
 int dolimit(struct chanset_t *);

src/mod/share.mod/share.c

@@ -11,6 +11,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/stat.h>
+#include <stdarg.h>
 
 #include "src/chan.h"
 #include "src/net.h"
@@ -72,7 +73,7 @@ tandbuf *tbuf;
 
 /* Prototypes */
 static void start_sending_users(int);
-static void shareout_but EGG_VARARGS(struct chanset_t *, arg1);
+static void shareout_but (struct chanset_t *, ...);
 static int flush_tbuf(char *);
 static int can_resync(char *);
 static void dump_resync(int);
@@ -1319,15 +1320,14 @@ static void sharein_mod(int idx, char *msg)
   }
 }
 
-static void shareout_mod EGG_VARARGS_DEF(struct chanset_t *, arg1)
+static void shareout_mod (struct chanset_t *chan, ...)
 {
   int i, l;
   char *format;
   char s[601];
-  struct chanset_t *chan;
   va_list va;
 
-  chan = EGG_VARARGS_START(struct chanset_t *, arg1, va);
+  va_start(va, chan);
   if (!chan || channel_shared(chan)) {
     format = va_arg(va, char *);
     strcpy(s, "s ");
@@ -1349,15 +1349,14 @@ static void shareout_mod EGG_VARARGS_DEF(struct chanset_t *, arg1)
   va_end(va);
 }
 
-static void shareout_but EGG_VARARGS_DEF(struct chanset_t *, arg1)
+static void shareout_but (struct chanset_t *chan, ...)
 {
   int i, x, l;
   char *format;
   char s[601];
-  struct chanset_t *chan;
   va_list va;
 
-  chan = EGG_VARARGS_START(struct chanset_t *, arg1, va);
+  va_start(va, chan);
   x = va_arg(va, int);
   format = va_arg(va, char *);
 

src/tandem.h

@@ -49,7 +49,7 @@ void botnet_send_chat(int, char *, char *);
 void botnet_send_act(int, char *, char *, int, char *);
 void botnet_send_ping(int);
 void botnet_send_pong(int);
-void botnet_send_priv EGG_VARARGS(int, arg1);
+void botnet_send_priv (int, ...);
 void botnet_send_who(int, char *, char *, int);
 void botnet_send_infoq(int, char *);
 void botnet_send_unlinked(int, char *, char *);

src/tclhash.c

@@ -15,6 +15,7 @@
 #include "users.h"
 #include "match.h"
 #include "egg_timer.h"
+#include <stdarg.h>
 
 extern struct dcc_t *dcc;
 extern int dcc_total;