diff options
| author | gad <gad@FreeBSD.org> | 2002-04-07 08:01:42 +0000 |
|---|---|---|
| committer | gad <gad@FreeBSD.org> | 2002-04-07 08:01:42 +0000 |
| commit | 1a0c92cc050bf47b070eb7dda00be930f40f1519 (patch) | |
| tree | 63fe45625fcb3d0fae7c09ced503e19d7218882e /usr.sbin/lpr | |
| parent | 5b5bb6df40e9889c23eb32ad8e40d5e986837da7 (diff) | |
| download | FreeBSD-src-1a0c92cc050bf47b070eb7dda00be930f40f1519.zip FreeBSD-src-1a0c92cc050bf47b070eb7dda00be930f40f1519.tar.gz | |
Rename a variable from 'user' to 'userid' to avoid some compiler warnings.
MFC after: 12 days
Diffstat (limited to 'usr.sbin/lpr')
| -rw-r--r-- | usr.sbin/lpr/lpd/printjob.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 04b9fd4..103286e 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -148,7 +148,7 @@ static char *scnline(int _key, char *_p, int _c); static int sendfile(struct printer *_pp, int _type, char *_file, char _format); static int sendit(struct printer *_pp, char *_file); -static void sendmail(struct printer *_pp, char *_user, int _bombed); +static void sendmail(struct printer *_pp, char *_userid, int _bombed); static void setty(const struct printer *_pp); void @@ -1379,7 +1379,7 @@ dropit(int c) * tell people about job completion */ static void -sendmail(struct printer *pp, char *user, int bombed) +sendmail(struct printer *pp, char *userid, int bombed) { register int i; int p[2], s; @@ -1400,7 +1400,7 @@ sendmail(struct printer *pp, char *user, int bombed) _exit(0); } else if (s > 0) { /* parent */ dup2(p[1], 1); - printf("To: %s@%s\n", user, origin_host); + printf("To: %s@%s\n", userid, origin_host); printf("Subject: %s printer job \"%s\"\n", pp->printer, *jobname ? jobname : "<unknown>"); printf("Reply-To: root@%s\n\n", local_host); @@ -1443,14 +1443,14 @@ sendmail(struct printer *pp, char *user, int bombed) fflush(stdout); (void) close(1); } else { - syslog(LOG_WARNING, "unable to send mail to %s: %m", user); + syslog(LOG_WARNING, "unable to send mail to %s: %m", userid); return; } (void) close(p[0]); (void) close(p[1]); wait(NULL); syslog(LOG_INFO, "mail sent to user %s about job %s on printer %s (%s)", - user, *jobname ? jobname : "<unknown>", pp->printer, cp); + userid, *jobname ? jobname : "<unknown>", pp->printer, cp); } /* |
