diff options
| author | gad <gad@FreeBSD.org> | 2001-06-15 16:28:37 +0000 |
|---|---|---|
| committer | gad <gad@FreeBSD.org> | 2001-06-15 16:28:37 +0000 |
| commit | a2e364fff77d5509fa8af63d046c166203d97da8 (patch) | |
| tree | a5811d553f3de3564033f5fca355610ed870db5c /usr.sbin/lpr/common_source | |
| parent | df20a2faa4ab2c79c57b3d90035df5494ddea44a (diff) | |
| download | FreeBSD-src-a2e364fff77d5509fa8af63d046c166203d97da8.zip FreeBSD-src-a2e364fff77d5509fa8af63d046c166203d97da8.tar.gz | |
Rename global variable 'name' to 'progname', thus fixing a number of
warnings which come up for various routines that have a parameter which
is also called 'name'.
Reviewed by: freebsd-print@bostonradio.org
MFC after: 1 week
Diffstat (limited to 'usr.sbin/lpr/common_source')
| -rw-r--r-- | usr.sbin/lpr/common_source/common.c | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index 2cf17ec..8e705db 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -64,7 +64,7 @@ static const char rcsid[] = * Routines and data common to all the line printer functions. */ char line[BUFSIZ]; -const char *name; /* program name */ +const char *progname; /* program name */ extern uid_t uid, euid; @@ -555,7 +555,7 @@ fatal(pp, msg, va_alist) #endif if (from != host) (void)printf("%s: ", host); - (void)printf("%s: ", name); + (void)printf("%s: ", progname); if (pp && pp->printer) (void)printf("%s: ", pp->printer); (void)vprintf(msg, ap); diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 2bfd84c..3cee695 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -153,7 +153,7 @@ struct request { * Global definitions for the line printer system. */ extern char line[BUFSIZ]; -extern const char *name; /* program name */ +extern const char *progname; /* program name (lpr, lpq, etc) */ /* host machine name */ extern char host[MAXHOSTNAMELEN]; extern char *from; /* client's machine name */ |
