Module Name: src
Committed By: rillig
Date: Sun Jan 3 20:14:38 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: decl.c emit1.c externs1.h func.c
Log Message:
lint: rename prflstrg to printflike_argnum, likewise for scflstrg
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/lint1/func.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.109 src/usr.bin/xlint/lint1/decl.c:1.110
--- src/usr.bin/xlint/lint1/decl.c:1.109 Sun Jan 3 19:15:36 2021
+++ src/usr.bin/xlint/lint1/decl.c Sun Jan 3 20:14:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.109 2021/01/03 19:15:36 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.110 2021/01/03 20:14:38 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.109 2021/01/03 19:15:36 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.110 2021/01/03 20:14:38 rillig Exp $");
#endif
#include <sys/param.h>
@@ -2389,14 +2389,16 @@ check_func_lint_directives(void)
tspec_t t;
/* check for illegal combinations of lint directives */
- if (prflstrg != -1 && scflstrg != -1) {
+ if (printflike_argnum != -1 && scanflike_argnum != -1) {
/* can't be used together: ** PRINTFLIKE ** ** SCANFLIKE ** */
warning(289);
- prflstrg = scflstrg = -1;
+ printflike_argnum = scanflike_argnum = -1;
}
- if (nvararg != -1 && (prflstrg != -1 || scflstrg != -1)) {
+ if (nvararg != -1 &&
+ (printflike_argnum != -1 || scanflike_argnum != -1)) {
/* dubious use of ** VARARGS ** with ** %s ** */
- warning(288, prflstrg != -1 ? "PRINTFLIKE" : "SCANFLIKE");
+ warning(288,
+ printflike_argnum != -1 ? "PRINTFLIKE" : "SCANFLIKE");
nvararg = -1;
}
@@ -2417,22 +2419,23 @@ check_func_lint_directives(void)
warning(283, "VARARGS");
nvararg = 0;
}
- if (prflstrg > narg) {
+ if (printflike_argnum > narg) {
/* argument number mismatch with directive: ** %s ** */
warning(283, "PRINTFLIKE");
- prflstrg = -1;
- } else if (prflstrg == 0) {
- prflstrg = -1;
+ printflike_argnum = -1;
+ } else if (printflike_argnum == 0) {
+ printflike_argnum = -1;
}
- if (scflstrg > narg) {
+ if (scanflike_argnum > narg) {
/* argument number mismatch with directive: ** %s ** */
warning(283, "SCANFLIKE");
- scflstrg = -1;
- } else if (scflstrg == 0) {
- scflstrg = -1;
- }
- if (prflstrg != -1 || scflstrg != -1) {
- narg = prflstrg != -1 ? prflstrg : scflstrg;
+ scanflike_argnum = -1;
+ } else if (scanflike_argnum == 0) {
+ scanflike_argnum = -1;
+ }
+ if (printflike_argnum != -1 || scanflike_argnum != -1) {
+ narg = printflike_argnum != -1
+ ? printflike_argnum : scanflike_argnum;
arg = dcs->d_fargs;
for (n = 1; n < narg; n++)
arg = arg->s_next;
@@ -2441,7 +2444,7 @@ check_func_lint_directives(void)
t != UCHAR && t != SCHAR)) {
/* arg. %d must be 'char *' for PRINTFLIKE/SCANFLIKE */
warning(293, narg);
- prflstrg = scflstrg = -1;
+ printflike_argnum = scanflike_argnum = -1;
}
}
}
Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.32 src/usr.bin/xlint/lint1/emit1.c:1.33
--- src/usr.bin/xlint/lint1/emit1.c:1.32 Sat Jan 2 18:26:44 2021
+++ src/usr.bin/xlint/lint1/emit1.c Sun Jan 3 20:14:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.32 2021/01/02 18:26:44 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.33 2021/01/03 20:14:38 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit1.c,v 1.32 2021/01/02 18:26:44 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.33 2021/01/03 20:14:38 rillig Exp $");
#endif
#include <ctype.h>
@@ -330,25 +330,25 @@ outfdef(sym_t *fsym, pos_t *posp, int rv
/* flags */
/* both SCANFLIKE and PRINTFLIKE imply VARARGS */
- if (prflstrg != -1) {
- nvararg = prflstrg;
- } else if (scflstrg != -1) {
- nvararg = scflstrg;
+ if (printflike_argnum != -1) {
+ nvararg = printflike_argnum;
+ } else if (scanflike_argnum != -1) {
+ nvararg = scanflike_argnum;
}
if (nvararg != -1) {
outchar('v');
outint(nvararg);
}
- if (scflstrg != -1) {
+ if (scanflike_argnum != -1) {
outchar('S');
- outint(scflstrg);
+ outint(scanflike_argnum);
}
- if (prflstrg != -1) {
+ if (printflike_argnum != -1) {
outchar('P');
- outint(prflstrg);
+ outint(printflike_argnum);
}
- nvararg = prflstrg = scflstrg = -1;
+ nvararg = printflike_argnum = scanflike_argnum = -1;
outchar('d');
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.45 src/usr.bin/xlint/lint1/externs1.h:1.46
--- src/usr.bin/xlint/lint1/externs1.h:1.45 Sun Jan 3 17:42:45 2021
+++ src/usr.bin/xlint/lint1/externs1.h Sun Jan 3 20:14:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.45 2021/01/03 17:42:45 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.46 2021/01/03 20:14:38 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -232,9 +232,9 @@ extern int nargusg;
extern pos_t argsused_pos;
extern int nvararg;
extern pos_t vapos;
-extern int prflstrg;
+extern int printflike_argnum;
extern pos_t printflike_pos;
-extern int scflstrg;
+extern int scanflike_argnum;
extern pos_t scanflike_pos;
extern int constcond_flag;
extern int llibflg;
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.48 src/usr.bin/xlint/lint1/func.c:1.49
--- src/usr.bin/xlint/lint1/func.c:1.48 Sun Jan 3 20:04:08 2021
+++ src/usr.bin/xlint/lint1/func.c Sun Jan 3 20:14:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.48 2021/01/03 20:04:08 rillig Exp $ */
+/* $NetBSD: func.c,v 1.49 2021/01/03 20:14:38 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.48 2021/01/03 20:04:08 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.49 2021/01/03 20:14:38 rillig Exp $");
#endif
#include <stdlib.h>
@@ -97,15 +97,15 @@ int nvararg = -1;
pos_t vapos;
/*
- * Both prflstr and scflstrg contain the number of the argument which
- * shall be used to check the types of remaining arguments (for PRINTFLIKE
- * and SCANFLIKE).
+ * Both printflike_argnum and scanflike_argnum contain the 1-based number
+ * of the string argument which shall be used to check the types of remaining
+ * arguments (for PRINTFLIKE and SCANFLIKE).
*
* printflike_pos and scanflike_pos are the positions of the last PRINTFLIKE
* or SCANFLIKE comment.
*/
-int prflstrg = -1;
-int scflstrg = -1;
+int printflike_argnum = -1;
+int scanflike_argnum = -1;
pos_t printflike_pos;
pos_t scanflike_pos;
@@ -1061,21 +1061,21 @@ global_clean_up_decl(int silent)
}
nvararg = -1;
}
- if (prflstrg != -1) {
+ if (printflike_argnum != -1) {
if (!silent) {
curr_pos = printflike_pos;
/* must precede function definition: ** %s ** */
warning(282, "PRINTFLIKE");
}
- prflstrg = -1;
+ printflike_argnum = -1;
}
- if (scflstrg != -1) {
+ if (scanflike_argnum != -1) {
if (!silent) {
curr_pos = scanflike_pos;
/* must precede function definition: ** %s ** */
warning(282, "SCANFLIKE");
}
- scflstrg = -1;
+ scanflike_argnum = -1;
}
curr_pos = cpos;
@@ -1153,11 +1153,11 @@ printflike(int n)
warning(280, "PRINTFLIKE");
return;
}
- if (prflstrg != -1) {
+ if (printflike_argnum != -1) {
/* duplicate use of ** %s ** */
warning(281, "PRINTFLIKE");
}
- prflstrg = n;
+ printflike_argnum = n;
printflike_pos = curr_pos;
}
@@ -1179,11 +1179,11 @@ scanflike(int n)
warning(280, "SCANFLIKE");
return;
}
- if (scflstrg != -1) {
+ if (scanflike_argnum != -1) {
/* duplicate use of ** %s ** */
warning(281, "SCANFLIKE");
}
- scflstrg = n;
+ scanflike_argnum = n;
scanflike_pos = curr_pos;
}
