Module Name: src
Committed By: rillig
Date: Sun Mar 21 13:03:42 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: func.c lint1.h
Log Message:
lint: rename c_rchif to c_reached_end_of_then
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/xlint/lint1/lint1.h
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/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.86 src/usr.bin/xlint/lint1/func.c:1.87
--- src/usr.bin/xlint/lint1/func.c:1.86 Sun Mar 21 12:10:27 2021
+++ src/usr.bin/xlint/lint1/func.c Sun Mar 21 13:03:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.86 2021/03/21 12:10:27 rillig Exp $ */
+/* $NetBSD: func.c,v 1.87 2021/03/21 13:03:42 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.86 2021/03/21 12:10:27 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.87 2021/03/21 13:03:42 rillig Exp $");
#endif
#include <stdlib.h>
@@ -615,8 +615,8 @@ void
if2(void)
{
- cstmt->c_rchif = reached;
- reached = true;
+ cstmt->c_reached_end_of_then = reached;
+ reached = true; /* XXX: sure? */
}
/*
@@ -628,7 +628,7 @@ if3(bool els)
{
if (els) {
- reached |= cstmt->c_rchif;
+ reached |= cstmt->c_reached_end_of_then;
} else {
reached = true;
}
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.84 src/usr.bin/xlint/lint1/lint1.h:1.85
--- src/usr.bin/xlint/lint1/lint1.h:1.84 Sun Mar 21 12:08:34 2021
+++ src/usr.bin/xlint/lint1/lint1.h Sun Mar 21 13:03:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.84 2021/03/21 12:08:34 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.85 2021/03/21 13:03:42 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -393,7 +393,7 @@ typedef struct control_statement {
* always true (as in 'for (;;)' or
* 'while (1)'), there may be break
* statements though */
- bool c_rchif : 1; /* end of if-branch reached */
+ bool c_reached_end_of_then : 1;
bool c_had_return_noval : 1; /* had "return;" */
bool c_had_return_value : 1; /* had "return (e);" */
type_t *c_swtype; /* type of switch expression */
