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
|
$NetBSD: patch-ad,v 1.1 2003/12/19 12:24:25 agc Exp $
--- clients/ftp/ftp.c 2003/12/19 12:10:21 1.1
+++ clients/ftp/ftp.c 2003/12/19 12:11:47
@@ -48,7 +48,7 @@
#include <fcntl.h>
#endif
-#include <varargs.h>
+#include <stdarg.h>
#ifdef FASCIST
#include <syslog.h>
@@ -241,9 +241,8 @@
}
/*VARARGS*/
-int command(va_alist) va_dcl {
+int command(char *fmt, ...) {
va_list ap;
- char *fmt;
int r;
sig_t oldintr;
@@ -251,8 +250,7 @@
if (debug) {
printf("---> ");
- va_start(ap);
- fmt = va_arg(ap, char *);
+ va_start(ap, fmt);
if (strncmp("PASS ", fmt, 5) == 0)
printf("PASS XXXX");
else
@@ -271,8 +269,7 @@
oldintr = (sig_t)Signal(SIGINT, cmdabort);
- va_start(ap);
- fmt = va_arg(ap, char *);
+ va_start(ap, fmt);
vfprintf(cout, fmt, ap);
va_end(ap);
|