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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
*** xhime.c.orig Sun Nov 9 05:45:35 2003
--- xhime.c Tue Feb 3 22:22:23 2004
***************
*** 24,32 ****
#include <signal.h>
#include <ctype.h> /* defined in X11/Xos.h ? */
#include <string.h>/* defined in X11/Xos.h ? */
#include <limits.h>
! #include <varargs.h>
#include <sys/time.h>/* defined in X11/Xos.h */
#include <sys/types.h>
#include <sys/stat.h>
#ifndef O_RDONLY
--- 24,32 ----
#include <signal.h>
#include <ctype.h> /* defined in X11/Xos.h ? */
#include <string.h>/* defined in X11/Xos.h ? */
#include <limits.h>
! #include <stdarg.h>
#include <sys/time.h>/* defined in X11/Xos.h */
#include <sys/types.h>
#include <sys/stat.h>
#ifndef O_RDONLY
***************
*** 115,148 ****
int ActionFlag = ACT_NONE;
/* -- */
void
! Error(va_alist)
! va_dcl
{
va_list args;
- char *fmt;
fprintf(stderr, "%s: ", ProgramName);
! va_start(args);
fmt = (char *)va_arg(args, char *);
vfprintf(stderr, fmt, args);
va_end(args);
fprintf(stderr, "\n");
}
void
! ErrorExit(va_alist)
! va_dcl
{
va_list args;
- char *fmt;
fprintf(stderr, "%s: ", ProgramName);
! va_start(args);
fmt = (char *)va_arg(args, char *);
vfprintf(stderr, fmt, args);
va_end(args);
--- 115,144 ----
int ActionFlag = ACT_NONE;
/* -- */
void
! Error(char *fmt, ...)
{
va_list args;
fprintf(stderr, "%s: ", ProgramName);
! va_start(args, fmt);
fmt = (char *)va_arg(args, char *);
vfprintf(stderr, fmt, args);
va_end(args);
fprintf(stderr, "\n");
}
void
! ErrorExit(char *fmt, ...)
{
va_list args;
fprintf(stderr, "%s: ", ProgramName);
! va_start(args, fmt);
fmt = (char *)va_arg(args, char *);
vfprintf(stderr, fmt, args);
va_end(args);
***************
*** 1363,1371 ****
}
exit(0);
}
! void
main(argc, argv)
int argc;
char *argv[];
{
--- 1359,1367 ----
}
exit(0);
}
! int
main(argc, argv)
int argc;
char *argv[];
{
|
