Module Name: src
Committed By: rillig
Date: Sun Jan 10 11:17:53 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: externs1.h func.c tree.c
Log Message:
lint: rename cvtcon to convert_constant
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.145 -r1.146 src/usr.bin/xlint/lint1/tree.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/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.50 src/usr.bin/xlint/lint1/externs1.h:1.51
--- src/usr.bin/xlint/lint1/externs1.h:1.50 Sat Jan 9 19:13:17 2021
+++ src/usr.bin/xlint/lint1/externs1.h Sun Jan 10 11:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.50 2021/01/09 19:13:17 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.51 2021/01/10 11:17:53 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -207,7 +207,7 @@ extern tnode_t *cconv(tnode_t *);
extern bool typeok(op_t, int, tnode_t *, tnode_t *);
extern tnode_t *promote(op_t, int, tnode_t *);
extern tnode_t *convert(op_t, int, type_t *, tnode_t *);
-extern void cvtcon(op_t, int, type_t *, val_t *, val_t *);
+extern void convert_constant(op_t, int, type_t *, val_t *, val_t *);
extern tnode_t *build_sizeof(type_t *);
extern tnode_t *build_offsetof(type_t *, sym_t *);
extern tnode_t *build_alignof(type_t *);
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.55 src/usr.bin/xlint/lint1/func.c:1.56
--- src/usr.bin/xlint/lint1/func.c:1.55 Sun Jan 10 00:05:46 2021
+++ src/usr.bin/xlint/lint1/func.c Sun Jan 10 11:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.55 2021/01/10 00:05:46 rillig Exp $ */
+/* $NetBSD: func.c,v 1.56 2021/01/10 11:17:53 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.55 2021/01/10 00:05:46 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.56 2021/01/10 11:17:53 rillig Exp $");
#endif
#include <stdlib.h>
@@ -465,7 +465,7 @@ check_case_label(tnode_t *tn, cstk_t *ci
*/
v = constant(tn, 1);
(void) memset(&nv, 0, sizeof nv);
- cvtcon(CASE, 0, ci->c_swtype, &nv, v);
+ convert_constant(CASE, 0, ci->c_swtype, &nv, v);
free(v);
/* look if we had this value already */
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.145 src/usr.bin/xlint/lint1/tree.c:1.146
--- src/usr.bin/xlint/lint1/tree.c:1.145 Sun Jan 10 00:12:50 2021
+++ src/usr.bin/xlint/lint1/tree.c Sun Jan 10 11:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.145 2021/01/10 00:12:50 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.146 2021/01/10 11:17:53 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.145 2021/01/10 00:12:50 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.146 2021/01/10 11:17:53 rillig Exp $");
#endif
#include <float.h>
@@ -1803,7 +1803,8 @@ convert(op_t op, int arg, type_t *tp, tn
} else {
ntn->tn_op = CON;
ntn->tn_val = tgetblk(sizeof (val_t));
- cvtcon(op, arg, ntn->tn_type, ntn->tn_val, tn->tn_val);
+ convert_constant(op, arg, ntn->tn_type, ntn->tn_val,
+ tn->tn_val);
}
return ntn;
@@ -2017,7 +2018,7 @@ check_pointer_conversion(op_t op, tnode_
* v old constant
*/
void
-cvtcon(op_t op, int arg, type_t *tp, val_t *nv, val_t *v)
+convert_constant(op_t op, int arg, type_t *tp, val_t *nv, val_t *v)
{
tspec_t ot, nt;
ldbl_t max = 0.0, min = 0.0;
