Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint: merge duplicate code for passing flags to subprocesses 

No functional change.
This commit is contained in:
rillig 2021-08-19 16:05:56 +00:00
parent 85e2caa505
commit 2b94fdc43e
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usr.bin/xlint/xlint/xlint.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xlint.c,v 1.73 2021/08/19 15:55:23 rillig Exp $ */ /* $NetBSD: xlint.c,v 1.74 2021/08/19 16:05:56 rillig Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@ -38,7 +38,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint) #if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: xlint.c,v 1.73 2021/08/19 15:55:23 rillig Exp $"); __RCSID("$NetBSD: xlint.c,v 1.74 2021/08/19 16:05:56 rillig Exp $");
#endif #endif
#include <sys/param.h> #include <sys/param.h>
@ -394,10 +394,13 @@ main(int argc, char *argv[])
case 'v': case 'v':
case 'w': case 'w':
case 'z': case 'z':
case 'P':
pass_flag_to_lint1(c); pass_flag_to_lint1(c);
break; break;
case 'A': case 'A':
case 'R':
case 'X':
pass_flag_to_lint1(c); pass_flag_to_lint1(c);
pass_to_lint1(optarg); pass_to_lint1(optarg);
break; break;
@ -411,11 +414,6 @@ main(int argc, char *argv[])
pass_flag_to_lint2(c); pass_flag_to_lint2(c);
break; break;
case 'X':
pass_flag_to_lint1(c);
pass_to_lint1(optarg);
break;
case 'i': case 'i':
if (Cflag) if (Cflag)
usage(); usage();
@ -427,21 +425,12 @@ main(int argc, char *argv[])
break; break;
case 'p': case 'p':
pass_flag_to_lint1(c);
pass_flag_to_lint2(c);
if (*deflibs != NULL) { if (*deflibs != NULL) {
list_clear(&deflibs); list_clear(&deflibs);
list_add_copy(&deflibs, "c"); list_add_copy(&deflibs, "c");
} }
break;
case 'P':
pass_flag_to_lint1(c); pass_flag_to_lint1(c);
break; pass_flag_to_lint2(c);
case 'R':
pass_flag_to_lint1(c);
pass_to_lint1(optarg);
break; break;
case 's': case 's':
@ -452,16 +441,16 @@ main(int argc, char *argv[])
list_add_copy(&cpp.lcflags, "-Wtrigraphs"); list_add_copy(&cpp.lcflags, "-Wtrigraphs");
list_add_copy(&cpp.lcflags, "-pedantic"); list_add_copy(&cpp.lcflags, "-pedantic");
list_add_copy(&cpp.lcflags, "-D__STRICT_ANSI__"); list_add_copy(&cpp.lcflags, "-D__STRICT_ANSI__");
sflag = true;
pass_flag_to_lint1(c); pass_flag_to_lint1(c);
pass_flag_to_lint2(c); pass_flag_to_lint2(c);
sflag = true;
break; break;
case 'S': case 'S':
if (tflag) if (tflag)
usage(); usage();
pass_flag_to_lint1(c);
Sflag = true; Sflag = true;
pass_flag_to_lint1(c);
break; break;
case 'T': case 'T':
@ -474,6 +463,7 @@ main(int argc, char *argv[])
case 't': case 't':
if (sflag) if (sflag)
usage(); usage();
tflag = true;
list_clear(&cpp.lcflags); list_clear(&cpp.lcflags);
list_add_copy(&cpp.lcflags, "-traditional"); list_add_copy(&cpp.lcflags, "-traditional");
list_add_copy(&cpp.lcflags, "-Wtraditional"); list_add_copy(&cpp.lcflags, "-Wtraditional");
@ -481,11 +471,11 @@ main(int argc, char *argv[])
list_add_copy(&cpp.lcflags, "-D" MACHINE_ARCH); list_add_copy(&cpp.lcflags, "-D" MACHINE_ARCH);
pass_flag_to_lint1(c); pass_flag_to_lint1(c);
pass_flag_to_lint2(c); pass_flag_to_lint2(c);
tflag = true;
break; break;
#endif #endif
case 'x': case 'x':
case 'H':
pass_flag_to_lint2(c); pass_flag_to_lint2(c);
break; break;
@ -530,10 +520,6 @@ main(int argc, char *argv[])
list_add_copy(&libsrchpath, optarg); list_add_copy(&libsrchpath, optarg);
break; break;
case 'H':
pass_flag_to_lint2(c);
break;
case 'B': case 'B':
Bflag = true; Bflag = true;
libexec_path = xstrdup(optarg); libexec_path = xstrdup(optarg);