diff options
author | markm <markm@FreeBSD.org> | 2001-04-28 07:55:19 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2001-04-28 07:55:19 +0000 |
commit | fefaa70f2e617dfbdf1e28b70b08e24a9e3739c6 (patch) | |
tree | b893a1845ac8afef5f0d1e7fad1b737229d62649 /libexec/ftpd/ftpcmd.y | |
parent | 1b58f2ae2733fa58fdca156cc58c08860e03c089 (diff) | |
download | FreeBSD-src-fefaa70f2e617dfbdf1e28b70b08e24a9e3739c6.zip FreeBSD-src-fefaa70f2e617dfbdf1e28b70b08e24a9e3739c6.tar.gz |
Change names of functions and variables with global scope that are
in conflict with library values of the same name. This allows static
linking.
Diffstat (limited to 'libexec/ftpd/ftpcmd.y')
-rw-r--r-- | libexec/ftpd/ftpcmd.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 9a4d125..1ae6e41 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -81,7 +81,7 @@ extern int paranoid; extern int logging; extern int type; extern int form; -extern int debug; +extern int ftpdebug; extern int timeout; extern int maxtimeout; extern int pdata; @@ -232,10 +232,10 @@ cmd memset(&data_dest, 0, sizeof(data_dest)); tmp = strdup($4); - if (debug) + if (ftpdebug) syslog(LOG_DEBUG, "%s", tmp); if (!tmp) { - fatal("not enough core"); + fatalerror("not enough core"); /*NOTREACHED*/ } p = tmp; @@ -255,7 +255,7 @@ cmd } *q++ = '\0'; result[i] = p; - if (debug) + if (ftpdebug) syslog(LOG_DEBUG, "%d: %s", i, p); p = q; } @@ -1159,7 +1159,7 @@ getline(s, n, iop) *cs++ = tmpline[c]; if (tmpline[c] == '\n') { *cs++ = '\0'; - if (debug) + if (ftpdebug) syslog(LOG_DEBUG, "command: %s", s); tmpline[0] = '\0'; return(s); @@ -1199,7 +1199,7 @@ getline(s, n, iop) if (c == EOF && cs == s) return (NULL); *cs++ = '\0'; - if (debug) { + if (ftpdebug) { if (!guest && strncasecmp("pass ", s, 5) == 0) { /* Don't syslog passwords */ syslog(LOG_DEBUG, "command: %.5s ???", s); @@ -1448,7 +1448,7 @@ yylex() break; default: - fatal("Unknown state in scanner."); + fatalerror("Unknown state in scanner."); } yyerror((char *) 0); state = CMD; @@ -1475,7 +1475,7 @@ copy(s) p = malloc((unsigned) strlen(s) + 1); if (p == NULL) - fatal("Ran out of memory."); + fatalerror("Ran out of memory."); (void) strcpy(p, s); return (p); } |