head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.44
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.42
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.40
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.38
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.36
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.34
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.32
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.30
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.28
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.26
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.24
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.22
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.20
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.18
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.16
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.14
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.12
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.10
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.8
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.6
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.4
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.2
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.1.0.8
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.6
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.4
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.2
	pkgsrc-2004Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.01.08.07.46.15;	author schmonz;	state dead;
branches;
next	1.1;

1.1
date	2004.01.28.14.43.01;	author agc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 4.5. No changelog available, and diffs are extensive.
Many (most?) are to take more care with types and declarations.
@
text
@$NetBSD: patch-ad,v 1.1 2004/01/28 14:43:01 agc Exp $

--- ml.c.orig	1997-05-16 19:43:51.000000000 +0100
+++ ml.c	2004-01-28 14:40:11.000000000 +0000
@@@@ -354,22 +354,19 @@@@
  * author, Paul Placeway (paul@@tut.cis.ohio-state.edu)
  */
 
-#include <varargs.h>
+#include <stdarg.h>
 
 /*VARARGS0*/
-mlwrite(va_alist)
-va_dcl
+mlwrite(char *fp, ...)
 {
-	register char *fp;
 	va_list ap;
 
 	if (clexec)
 		return;	
-	va_start(ap);
-	fp = va_arg(ap, char *);
+	va_start(ap, fp);
 	movecursor(term.t_nrow,0);
 	(*term.t_color)(CTEXT);
-	(void) mlprintf(fp, &ap);
+	(void) mlprintf(fp, ap);
 	va_end(ap);
 	(*term.t_eeol)();
 	(*term.t_flush)();
@@@@ -389,9 +386,7 @@@@
 static char prbuf[128];
 
 /*VARARGS*/
-mlprintf (fp, ap)
-register char	*fp;
-va_list		*ap;
+mlprintf (char *fp, ...)
 {
 	register char *f, *bp;
 	register long l;
@@@@ -399,9 +394,11 @@@@
 	register int i;
 	register int fmt;
 	register char pad = ' ';
+	va_list	ap;
 	int flush_left = 0, f_width = 0, prec = INF, hash = 0, do_long = 0;
 	int sign = 0;
 
+	va_start(ap, fp);
 	f = fp;
 	for (; *f; f++) {
 		CHKTTCOL();
@@@@ -419,7 +416,7 @@@@
 				f++;
 			}
 			if (*f == '*') {	/* field width */
-				f_width = va_arg(*ap, int);
+				f_width = va_arg(ap, int);
 				f++;
 			} else if (ISDIGIT(*f)) {
 				f_width = atoi (f);
@@@@ -429,7 +426,7 @@@@
 			if (*f == '.') {	/* precision */
 				f++;
 				if (*f == '*') {
-					prec = va_arg(*ap, int);
+					prec = va_arg(ap, int);
 					f++;
 				} else if (ISDIGIT(*f)) {
 					prec = atoi (f);
@@@@ -454,9 +451,9 @@@@
 			switch (fmt) {	/* do the format */
 			    case 'd':
 				if (do_long)
-					l = va_arg(*ap, long);
+					l = va_arg(ap, long);
 				else
-					l = (long) ( va_arg(*ap, int) );
+					l = (long) ( va_arg(ap, int) );
 				if (l < 0) {
 					sign = 1;		    
 					l = -l;
@@@@ -485,9 +482,9 @@@@
 			    case 'x':
 			    case 'u':
 				if (do_long)
-					u = va_arg(*ap, unsigned long);
+					u = va_arg(ap, unsigned long);
 				else
-					u = (unsigned long) (va_arg(*ap, unsigned));
+					u = (unsigned long) (va_arg(ap, unsigned));
 				if (fmt == 'u') { /* unsigned decimal */
 					do {
 						*bp++ = u % 10 + '0';
@@@@ -525,11 +522,11 @@@@
 					}
 				break;
 			    case 'c':
-				i = va_arg(*ap, int);
+				i = va_arg(ap, int);
 				mlputchar(i);
 				break;
 		  	    case 's':
-				bp = va_arg(*ap, char *);
+				bp = va_arg(ap, char *);
 				f_width = f_width - strlen(bp);
 				if (!flush_left)
 					while (f_width-- > 0) {
@@@@ -553,6 +550,7 @@@@
 			pad = ' ';
 		}
 	}
+	va_end(ap);
 	return 0;
 }
 
@


1.1
log
@make this compile with gcc3: varargs -> stdarg
@
text
@d1 1
a1 1
$NetBSD$
@