diff options
| author | gad <gad@FreeBSD.org> | 2001-06-15 22:03:07 +0000 |
|---|---|---|
| committer | gad <gad@FreeBSD.org> | 2001-06-15 22:03:07 +0000 |
| commit | e402d6c9159ae45f5056765c53cebfe6c25ee35e (patch) | |
| tree | 34bd9934cba11944407fb52a6d7f9c516d667752 /usr.sbin/lpr/lpd/recvjob.c | |
| parent | 134649df9dfcfa24c39e28dcbf0b24db1b8f9605 (diff) | |
| download | FreeBSD-src-e402d6c9159ae45f5056765c53cebfe6c25ee35e.zip FreeBSD-src-e402d6c9159ae45f5056765c53cebfe6c25ee35e.tar.gz | |
Rename a few global variables which hold hostname-related values to be
more sensible/understandable. 'from'->'from_host' 'host'->'local_host'
'fromb'->'frombuf' 'fromhost'->'origin_host' and a local-variable
named 'host'->'hostbuf'. This fixes some compile-time warnings about
local variables shadowing global variables.
Other than renaming variables, the only actual code changes are to call
strlcpy() instead of strncpy() when setting those (renamed) variables,
and that 'from_ip' is now a strdup()-created buffer instead of being a
static buffer compiled in as 1025 bytes.
Reviewed by: freebsd-print@bostonradio.org (an earlier version)
MFC after: 1 week
Diffstat (limited to 'usr.sbin/lpr/lpd/recvjob.c')
| -rw-r--r-- | usr.sbin/lpr/lpd/recvjob.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 661ad05..99e38de 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -186,7 +186,8 @@ readjob(struct printer *pp) * something different than what gethostbyaddr() * returns */ - strncpy(cp + 6, from, sizeof(line) + line - cp - 7); + strncpy(cp + 6, from_host, sizeof(line) + line - cp + - 7); line[sizeof(line) - 1 ] = '\0'; strncpy(tfname, cp, sizeof(tfname) - 1); tfname[sizeof (tfname) - 1] = '\0'; @@ -231,7 +232,7 @@ readjob(struct printer *pp) dfcnt++; trstat_init(pp, dfname, dfcnt); (void) readfile(pp, dfname, size); - trstat_write(pp, TR_RECVING, size, givenid, from, + trstat_write(pp, TR_RECVING, size, givenid, from_host, givenhost); continue; } @@ -386,7 +387,7 @@ frecverr(msg, va_alist) #else va_start(ap); #endif - syslog(LOG_ERR, "Error receiving job from %s:", fromb); + syslog(LOG_ERR, "Error receiving job from %s:", from_host); vsyslog(LOG_ERR, msg, ap); va_end(ap); /* |
