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
|
--- src/main.c.orig Thu Dec 24 06:24:50 1998
+++ src/main.c Sat Sep 17 13:24:27 2005
@@ -319,40 +319,27 @@
/* lvprintf( priority, same as printf ) - Logs to the log IF priority is smaller */
/* or equal to game.verbose */
-void lvprintf(va_alist)
-va_dcl
+void lvprintf(int priority, char *format, ...)
{ /* No bounds checking. Be very careful what you log */
- char *format; va_list va; static char SBUF2[768];int priority;
- va_start(va);
- priority=va_arg(va,int);format=va_arg(va,char *);
- vsprintf(SBUF2,format,va);
- if (strlen(SBUF2)>512)
- {
- SBUF2[512]=0; /* truncate string. Of course, by now we have buffer overrun ;) */
- }
-
- if (priority <= game.verbose)
+ if (priority <= game.verbose) {
+ va_list va; static char SBUF2[768];
+ va_start(va, format);
+ vsnprintf(SBUF2, sizeof(SBUF2),format,va);
lprintf(SBUF2);
-
- va_end(va);
+ va_end(va);
+ }
}
/* lprintf( same as printf ) - Logs to the log. */
-void lprintf(va_alist)
-va_dcl
+void lprintf(char *format, ...)
{ /* No bounds checking. Be very careful what you log */
- char *format; va_list va; static char SBUF2[768];
+ va_list va; static char SBUF2[768];
FILE *file_out;
char *mytime;
char *P;
time_t cur_time;
- va_start(va);
- format=va_arg(va,char *);
- vsprintf(SBUF2,format,va);
- if (strlen(SBUF2)>512)
- {
- SBUF2[512]=0; /* truncate string. Of course, by now we have buffer overrun ;) */
- }
+ va_start(va, format);
+ vsnprintf(SBUF2, sizeof(SBUF2),format,va);
file_out = fopen(FILE_LOG,"a");
if (file_out != NULL)
@@ -2462,7 +2449,7 @@
/* Winlist - Returns Winlist */
if (!strcasecmp(buf,"getwinlist"))
{
- lvprintf("%s: GetWinlist request\n",n->host);
+ lprintf("%s: GetWinlist request\n",n->host);
for(i=0;i<MAXWINLIST;i++)
{
if(winlist[i].inuse)
@@ -3071,4 +3058,4 @@
}
- }
\ No newline at end of file
+ }
|
