Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid conflict with reserved identifier "logf".

Browse Source
This commit is contained in:
thorpej 2002-12-06 15:17:18 +00:00
parent 61456e3f52
commit 4c278745df
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
usr.sbin/pppd/chat/chat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chat.c,v 1.25 2001/09/24 13:22:38 wiz Exp $ */ /* $NetBSD: chat.c,v 1.26 2002/12/06 15:17:18 thorpej Exp $ */
/* /*
* Chat -- a program for automatic session establishment (i.e. dial * Chat -- a program for automatic session establishment (i.e. dial
@ -93,7 +93,7 @@
#if 0 #if 0
static const char rcsid[] = "Id: chat.c,v 1.26 1999/12/23 01:39:54 paulus Exp "; static const char rcsid[] = "Id: chat.c,v 1.26 1999/12/23 01:39:54 paulus Exp ";
#else #else
__RCSID("$NetBSD: chat.c,v 1.25 2001/09/24 13:22:38 wiz Exp $"); __RCSID("$NetBSD: chat.c,v 1.26 2002/12/06 15:17:18 thorpej Exp $");
#endif #endif
#endif #endif
@ -207,7 +207,7 @@ int say_next = 0, hup_next = 0;
void *dup_mem __P((void *b, size_t c)); void *dup_mem __P((void *b, size_t c));
void *copy_of __P((char *s)); void *copy_of __P((char *s));
void usage __P((void)); void usage __P((void));
void logf __P((const char *fmt, ...)); void logit __P((const char *fmt, ...));
void fatal __P((int code, const char *fmt, ...)); void fatal __P((int code, const char *fmt, ...));
SIGTYPE sigalrm __P((int signo)); SIGTYPE sigalrm __P((int signo));
SIGTYPE sigint __P((int signo)); SIGTYPE sigint __P((int signo));
@ -473,7 +473,7 @@ char line[1024];
/* /*
* Send a message to syslog and/or stderr. * Send a message to syslog and/or stderr.
*/ */
void logf __V((const char *fmt, ...)) void logit __V((const char *fmt, ...))
{ {
va_list args; va_list args;
@ -538,7 +538,7 @@ int signo;
fatal(2, "Can't set file mode flags on stdin: %m"); fatal(2, "Can't set file mode flags on stdin: %m");
if (verbose) if (verbose)
logf("alarm"); logit("alarm");
} }
void unalarm() void unalarm()
@ -967,9 +967,9 @@ char *s;
* The expectation did not occur. This is terminal. * The expectation did not occur. This is terminal.
*/ */
if (fail_reason) if (fail_reason)
logf("Failed (%s)", fail_reason); logit("Failed (%s)", fail_reason);
else else
logf("Failed"); logit("Failed");
terminate(exit_code); terminate(exit_code);
} }
@ -1045,7 +1045,7 @@ register char *s;
abort_string[n_aborts++] = s1; abort_string[n_aborts++] = s1;
if (verbose) if (verbose)
logf("abort on (%v)", s); logit("abort on (%v)", s);
return; return;
} }
@ -1071,7 +1071,7 @@ register char *s;
pack++; pack++;
n_aborts--; n_aborts--;
if (verbose) if (verbose)
logf("clear abort on (%v)", s); logit("clear abort on (%v)", s);
} }
} }
free(s1); free(s1);
@ -1095,7 +1095,7 @@ register char *s;
report_string[n_reports++] = s1; report_string[n_reports++] = s1;
if (verbose) if (verbose)
logf("report (%v)", s); logit("report (%v)", s);
return; return;
} }
@ -1120,7 +1120,7 @@ register char *s;
pack++; pack++;
n_reports--; n_reports--;
if (verbose) if (verbose)
logf("clear report (%v)", s); logit("clear report (%v)", s);
} }
} }
free(s1); free(s1);
@ -1138,7 +1138,7 @@ register char *s;
timeout = DEFAULT_CHAT_TIMEOUT; timeout = DEFAULT_CHAT_TIMEOUT;
if (verbose) if (verbose)
logf("timeout set to %d seconds", timeout); logit("timeout set to %d seconds", timeout);
return; return;
} }
@ -1201,7 +1201,7 @@ int get_char()
return ((int)c & 0x7F); return ((int)c & 0x7F);
default: default:
logf("warning: read() on stdin returned %d", status); logit("warning: read() on stdin returned %d", status);
case -1: case -1:
if ((status = fcntl(0, F_GETFL, 0)) == -1) if ((status = fcntl(0, F_GETFL, 0)) == -1)
@ -1229,7 +1229,7 @@ int c;
return (0); return (0);
default: default:
logf("warning: write() on stdout returned %d", status); logit("warning: write() on stdout returned %d", status);
case -1: case -1:
if ((status = fcntl(0, F_GETFL, 0)) == -1) if ((status = fcntl(0, F_GETFL, 0)) == -1)
@ -1251,9 +1251,9 @@ int c;
if (verbose) { if (verbose) {
if (errno == EINTR || errno == EWOULDBLOCK) if (errno == EINTR || errno == EWOULDBLOCK)
logf(" -- write timed out"); logit(" -- write timed out");
else else
logf(" -- write failed: %m"); logit(" -- write failed: %m");
} }
return (0); return (0);
} }
@ -1268,9 +1268,9 @@ register char *s;
if (verbose) { if (verbose) {
if (quiet) if (quiet)
logf("send (?????\?)"); /* backslash to avoid trigraph ??) */ logit("send (?????\?)"); /* backslash to avoid trigraph ??) */
else else
logf("send (%v)", s); logit("send (%v)", s);
} }
alarm(timeout); alarmed = 0; alarm(timeout); alarmed = 0;
@ -1357,17 +1357,17 @@ register char *string;
minlen = (len > sizeof(fail_buffer)? len: sizeof(fail_buffer)) - 1; minlen = (len > sizeof(fail_buffer)? len: sizeof(fail_buffer)) - 1;
if (verbose) if (verbose)
logf("expect (%v)", string); logit("expect (%v)", string);
if (len > STR_LEN) { if (len > STR_LEN) {
logf("expect string is too long"); logit("expect string is too long");
exit_code = 1; exit_code = 1;
return 0; return 0;
} }
if (len == 0) { if (len == 0) {
if (verbose) if (verbose)
logf("got it"); logit("got it");
return (1); return (1);
} }
@ -1381,16 +1381,16 @@ register char *string;
echo_stderr(c); echo_stderr(c);
if (verbose && c == '\n') { if (verbose && c == '\n') {
if (s == logged) if (s == logged)
logf(""); /* blank line */ logit(""); /* blank line */
else else
logf("%0.*v", s - logged, logged); logit("%0.*v", s - logged, logged);
logged = s + 1; logged = s + 1;
} }
*s++ = c; *s++ = c;
if (verbose && s >= logged + 80) { if (verbose && s >= logged + 80) {
logf("%0.*v", s - logged, logged); logit("%0.*v", s - logged, logged);
logged = s; logged = s;
} }
@ -1435,8 +1435,8 @@ register char *string;
strncmp(s - len, string, len) == 0) { strncmp(s - len, string, len) == 0) {
if (verbose) { if (verbose) {
if (s > logged) if (s > logged)
logf("%0.*v", s - logged, logged); logit("%0.*v", s - logged, logged);
logf(" -- got it\n"); logit(" -- got it\n");
} }
alarm(0); alarm(0);
@ -1449,8 +1449,8 @@ register char *string;
strncmp(s - abort_len, abort_string[n], abort_len) == 0) { strncmp(s - abort_len, abort_string[n], abort_len) == 0) {
if (verbose) { if (verbose) {
if (s > logged) if (s > logged)
logf("%0.*v", s - logged, logged); logit("%0.*v", s - logged, logged);
logf(" -- failed"); logit(" -- failed");
} }
alarm(0); alarm(0);
@ -1464,7 +1464,7 @@ register char *string;
if (s >= end) { if (s >= end) {
if (logged < s - minlen) { if (logged < s - minlen) {
if (verbose) if (verbose)
logf("%0.*v", s - logged, logged); logit("%0.*v", s - logged, logged);
logged = s; logged = s;
} }
s -= minlen; s -= minlen;
@ -1474,16 +1474,16 @@ register char *string;
} }
if (alarmed && verbose) if (alarmed && verbose)
logf("warning: alarm synchronization problem"); logit("warning: alarm synchronization problem");
} }
alarm(0); alarm(0);
if (verbose && printed) { if (verbose && printed) {
if (alarmed) if (alarmed)
logf(" -- read timed out"); logit(" -- read timed out");
else else
logf(" -- read failed: %m"); logit(" -- read failed: %m");
} }
exit_code = 3; exit_code = 3;