1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

Unbreak print/dviselect by using stdargs instaed of varargs

Informed maintainer.
This commit is contained in:
Edwin Groothuis 2003-10-15 13:40:35 +00:00
parent 70d7d5dbbb
commit 9ec4f30441
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=91325
3 changed files with 55 additions and 27 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= dviselect
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
@ -20,10 +21,4 @@ SCRIPTS_ENV= CFLAGS="${CFLAGS}"
MAN1= dviselect.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 501000
BROKEN= "Does not compile"
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -1,20 +0,0 @@
--- lib/error.c.orig Wed Nov 15 04:19:40 1989
+++ lib/error.c Wed Sep 4 19:20:59 2002
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <varargs.h>
+#include <errno.h>
#ifdef lint
@@ -31,9 +32,6 @@
#else lint
extern char *ProgName;
-extern int errno;
-extern char *sys_errlist[];
-extern int sys_nerr;
error(va_alist)
va_dcl

View File

@ -0,0 +1,53 @@
--- lib/error.c.orig Wed Nov 15 04:19:40 1989
+++ lib/error.c Wed Oct 15 06:38:57 2003
@@ -18,7 +18,8 @@
*/
#include <stdio.h>
-#include <varargs.h>
+#include <stdarg.h>
+#include <errno.h>
#ifdef lint
@@ -31,20 +32,15 @@
#else lint
extern char *ProgName;
-extern int errno;
-extern char *sys_errlist[];
-extern int sys_nerr;
-error(va_alist)
- va_dcl
+error(char *fmt,...)
{
va_list l;
int quit, e;
- char *fmt;
(void) fflush(stdout); /* sync error messages */
(void) fprintf(stderr, "%s: ", ProgName);
- va_start(l);
+ va_start(l,fmt);
/* pick up the constant arguments: quit, errno, printf format */
quit = va_arg(l, int);
e = va_arg(l, int);
@@ -69,15 +65,13 @@
exit(quit);
}
-panic(va_alist)
- va_dcl
+panic(char *fmt,...)
{
va_list l;
- char *fmt;
(void) fflush(stdout);
(void) fprintf(stderr, "%s: panic: ", ProgName);
- va_start(l);
+ va_start(l,fmt);
/* pick up the constant argument: printf format */
fmt = va_arg(l, char *);
#if defined(sys5) || defined(HAVE_VPRINTF)