diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-03-23 17:08:21 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-03-23 17:08:21 +0000 |
commit | f6aa13d403085b1645b65caae4517a338f4636e6 (patch) | |
tree | f4c9ca939b621dfd1efcd227f0fe83813fa088a9 /syslogd.c | |
parent | 82ab8da24595fced332faf947cc63497216b09db (diff) | |
download | busybox-w32-f6aa13d403085b1645b65caae4517a338f4636e6.tar.gz busybox-w32-f6aa13d403085b1645b65caae4517a338f4636e6.tar.bz2 busybox-w32-f6aa13d403085b1645b65caae4517a338f4636e6.zip |
-Wshadow tr fix from Jeff Garzik
Diffstat (limited to 'syslogd.c')
-rw-r--r-- | syslogd.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -55,7 +55,7 @@ | |||
55 | #define __LOG_FILE "/var/log/messages" | 55 | #define __LOG_FILE "/var/log/messages" |
56 | 56 | ||
57 | /* Path to the unix socket */ | 57 | /* Path to the unix socket */ |
58 | char lfile[BUFSIZ] = ""; | 58 | static char lfile[BUFSIZ] = ""; |
59 | 59 | ||
60 | static char *logFilePath = __LOG_FILE; | 60 | static char *logFilePath = __LOG_FILE; |
61 | 61 | ||
@@ -390,18 +390,18 @@ static void domark(int sig) | |||
390 | static const int BUFSIZE = 1023; | 390 | static const int BUFSIZE = 1023; |
391 | static int serveConnection (int conn) | 391 | static int serveConnection (int conn) |
392 | { | 392 | { |
393 | RESERVE_BB_BUFFER(buf, BUFSIZE + 1); | 393 | RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1); |
394 | int n_read; | 394 | int n_read; |
395 | 395 | ||
396 | while ((n_read = read (conn, buf, BUFSIZE )) > 0) { | 396 | while ((n_read = read (conn, tmpbuf, BUFSIZE )) > 0) { |
397 | 397 | ||
398 | int pri = (LOG_USER | LOG_NOTICE); | 398 | int pri = (LOG_USER | LOG_NOTICE); |
399 | char line[ BUFSIZE + 1 ]; | 399 | char line[ BUFSIZE + 1 ]; |
400 | unsigned char c; | 400 | unsigned char c; |
401 | 401 | ||
402 | char *p = buf, *q = line; | 402 | char *p = tmpbuf, *q = line; |
403 | 403 | ||
404 | buf[ n_read - 1 ] = '\0'; | 404 | tmpbuf[ n_read - 1 ] = '\0'; |
405 | 405 | ||
406 | while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { | 406 | while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { |
407 | if (c == '<') { | 407 | if (c == '<') { |