diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c index f04d817b620..edcc0ab0b2e 100644 --- a/usr.bin/xlint/lint1/main1.c +++ b/usr.bin/xlint/lint1/main1.c @@ -35,6 +35,7 @@ #if defined(__RCSID) && !defined(lint) __RCSID("$NetBSD: main1.c,v 1.11 2002/01/29 02:43:38 tv Exp $"); #endif +__FBSDID("$FreeBSD$"); #include #include @@ -123,8 +124,6 @@ main(int argc, char *argv[]) int c; char *ptr; - setprogname(argv[0]); - ERR_ZERO(&msgset); while ((c = getopt(argc, argv, "abcdeghmprstuvwyzFX:")) != -1) { switch (c) { @@ -209,8 +208,7 @@ static void usage(void) { (void)fprintf(stderr, - "Usage: %s [-abcdeghmprstuvwyzF] [-X [,]... src dest\n", - getprogname()); + "Usage: lint1 [-abcdeghmprstuvwyzF] [-X [,]... src dest\n"); exit(1); } diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c index 380579196ef..27fdff3be38 100644 --- a/usr.bin/xlint/xlint/xlint.c +++ b/usr.bin/xlint/xlint/xlint.c @@ -283,14 +283,14 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-abceghprvwxzHF] [-s|-t] [-i|-nu] [-Dname[=def]]" - " [-Uname] [-X [,]...\n", getprogname()); + "Usage: lint [-abceghprvwxzHF] [-s|-t] [-i|-nu] [-Dname[=def]]" + " [-Uname] [-X [,]...\n"); (void)fprintf(stderr, "\t[-Idirectory] [-Ldirectory] [-llibrary] [-ooutputfile]" " file...\n"); (void)fprintf(stderr, - " %s [-abceghprvwzHF] [-s|-t] -Clibrary [-Dname[=def]]\n" - " [-X [,]...\n", getprogname()); + " lint [-abceghprvwzHF] [-s|-t] -Clibrary [-Dname[=def]]\n" + " [-X [,]...\n"); (void)fprintf(stderr, "\t[-Idirectory] [-Uname] [-Bpath] file" " ...\n"); terminate(-1); @@ -304,8 +304,6 @@ main(int argc, char *argv[]) char flgbuf[3], *tmp, *s; size_t len; - setprogname(argv[0]); - if ((tmp = getenv("TMPDIR")) == NULL || (len = strlen(tmp)) == 0) { tmpdir = xstrdup(_PATH_TMP); } else {