From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Tue, 27 Jul 2004 07:37:39 +0000 (+0000)
Subject: Get rid of varargs.h.
X-Git-Tag: v2.0.1~10667
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/dfa09e09b0db73fb61f9e6f507dfbeb8b90ae6cd

Get rid of varargs.h.
---

diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index 0fd9a507f2..c6e2fab054 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -32,7 +32,7 @@
  *
  * @(#)io.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/cribbage/io.c,v 1.5.2.2 2001/02/18 02:20:31 kris Exp $
- * $DragonFly: src/games/cribbage/io.c,v 1.2 2003/06/17 04:25:23 dillon Exp $
+ * $DragonFly: src/games/cribbage/io.c,v 1.3 2004/07/27 07:37:39 asmodai Exp $
  */
 
 #include <ctype.h>
@@ -43,11 +43,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "deck.h"
 #include "cribbage.h"
@@ -385,21 +381,11 @@ int     Mpos = 0;
 static int Newpos = 0;
 
 void
-#if __STDC__
 msg(const char *fmt, ...)
-#else
-msg(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
 	va_end(ap);
 	endmsg();
@@ -410,21 +396,11 @@ msg(fmt, va_alist)
  *	Add things to the current message
  */
 void
-#if __STDC__
 addmsg(const char *fmt, ...)
-#else
-addmsg(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
 	va_end(ap);
 }
diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index b1e5966412..bc3388089b 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -37,7 +37,7 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)quiz.c	8.3 (Berkeley) 5/4/95
  * $FreeBSD: src/games/quiz/quiz.c,v 1.12 1999/12/12 02:29:54 billf Exp $
- * $DragonFly: src/games/quiz/quiz.c,v 1.3 2003/11/12 14:53:54 eirikn Exp $
+ * $DragonFly: src/games/quiz/quiz.c,v 1.4 2004/07/27 07:37:39 asmodai Exp $
  */
 
 #include <sys/types.h>
@@ -360,27 +360,13 @@ usage()
 	exit(1);
 }
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 void
-#if __STDC__
 err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-	char *fmt;
-        va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)fprintf(stderr, "quiz: ");
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
diff --git a/games/snake/snake/move.c b/games/snake/snake/move.c
index 1f3934c401..35a3a097eb 100644
--- a/games/snake/snake/move.c
+++ b/games/snake/snake/move.c
@@ -32,7 +32,7 @@
  *
  * @(#)move.c	8.1 (Berkeley) 7/19/93
  * $FreeBSD: src/games/snake/snake/move.c,v 1.5.2.1 2000/08/17 06:21:44 jhb Exp $
- * $DragonFly: src/games/snake/snake/Attic/move.c,v 1.2 2003/06/17 04:25:25 dillon Exp $
+ * $DragonFly: src/games/snake/snake/Attic/move.c,v 1.3 2004/07/27 07:37:39 asmodai Exp $
  */
 
 /*************************************************************************
@@ -92,11 +92,7 @@
  ******************************************************************************/
 
 #include <errno.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <string.h>
 #include <unistd.h>
 
@@ -395,46 +391,25 @@ pch(c)
 }
 
 void
-#if __STDC__
 apr(struct point *ps, const char *fmt, ...)
-#else
-apr(ps, fmt, va_alist)
-	struct point *ps;
-	char *fmt;
-	va_dcl
-#endif
 {
 	struct point p;
 	va_list ap;
 
 	p.line = ps->line+1; p.col = ps->col+1;
 	move(&p);
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(str, fmt, ap);
 	va_end(ap);
 	pstring(str);
 }
 
 void
-#if __STDC__
 pr(const char *fmt, ...)
-#else
-pr(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(str, fmt, ap);
 	va_end(ap);
 	pstring(str);