1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
$NetBSD: patch-ak,v 1.1 2004/01/23 11:43:33 agc Exp $
--- textio/txOutput.c 2004/01/23 10:03:21 1.1
+++ textio/txOutput.c 2004/01/23 10:05:43
@@ -42,7 +42,7 @@
#include "utils/malloc.h"
#ifndef NO_VARARGS
-#include <varargs.h>
+#include <stdarg.h>
#endif NO_VARARGS
/* When a pipe has been opened to "more", the following variables
@@ -82,16 +82,11 @@
/*VARARGS0*/
void
-txFprintfBasic(va_alist)
-va_dcl
+txFprintfBasic(FILE *f, char *fmt, ...)
{
va_list args;
- char *fmt;
- FILE *f;
- va_start(args);
- f = va_arg(args, FILE *);
- fmt = va_arg(args, char *);
+ va_start(args, fmt);
(void) GrVfprintf(f, fmt, args);
va_end(args);
}
@@ -135,11 +130,9 @@
/*VARARGS0*/
void
-TxPrintf(va_alist)
-va_dcl
+TxPrintf(char *fmt, ...)
{
va_list args;
- char *fmt;
FILE *f;
if (txPrintFlag)
@@ -156,16 +149,14 @@
if (txHavePrompt)
{
TxUnPrompt();
- va_start(args);
- fmt = va_arg(args, char *);
+ va_start(args, fmt);
(void) GrVfprintf(f, fmt, args);
va_end(args);
TxPrompt();
}
else
{
- va_start(args);
- fmt = va_arg(args, char *);
+ va_start(args, fmt);
(void) GrVfprintf(f, fmt, args);
va_end(args);
}
@@ -306,11 +297,9 @@
#ifndef NO_VARARGS
void
-TxError(va_alist)
-va_dcl
+TxError(char *fmt, ...)
{
va_list args;
- char *fmt;
FILE *f;
(void) fflush(stdout);
@@ -321,15 +310,13 @@
if (txHavePrompt)
{
TxUnPrompt();
- va_start(args);
- fmt = va_arg(args, char *);
+ va_start(args, fmt);
(void) GrVfprintf(f, fmt, args);
va_end(args);
TxPrompt();
}
else {
- va_start(args);
- fmt = va_arg(args, char *);
+ va_start(args, fmt);
(void) GrVfprintf(f, fmt, args);
va_end(args);
}
|
