Module Name: src
Committed By: rillig
Date: Sat Dec 25 13:51:42 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: lex.c lint1.h mem1.c
Log Message:
lint: don't try to trick mathematics by defining ZERO to a nonzero value
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.133 -r1.134 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/xlint/lint1/mem1.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/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.95 src/usr.bin/xlint/lint1/lex.c:1.96
--- src/usr.bin/xlint/lint1/lex.c:1.95 Wed Dec 22 15:47:42 2021
+++ src/usr.bin/xlint/lint1/lex.c Sat Dec 25 13:51:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.95 2021/12/22 15:47:42 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.96 2021/12/25 13:51:42 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: lex.c,v 1.95 2021/12/22 15:47:42 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.96 2021/12/25 13:51:42 rillig Exp $");
#endif
#include <ctype.h>
@@ -369,7 +369,7 @@ static void
freesb(sbuf_t *sb)
{
- (void)memset(sb, ZERO, sizeof(*sb));
+ (void)memset(sb, INVALID_MEM_BYTE, sizeof(*sb));
sb->sb_next = sbuf_free_list;
sbuf_free_list = sb;
}
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.133 src/usr.bin/xlint/lint1/lint1.h:1.134
--- src/usr.bin/xlint/lint1/lint1.h:1.133 Wed Dec 22 15:20:08 2021
+++ src/usr.bin/xlint/lint1/lint1.h Sat Dec 25 13:51:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.133 2021/12/22 15:20:08 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.134 2021/12/25 13:51:42 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -486,9 +486,9 @@ typedef struct err_set {
} while (false)
#ifdef BLKDEBUG
-#define ZERO 0xa5
+#define INVALID_MEM_BYTE 0xa5
#else
-#define ZERO 0
+#define INVALID_MEM_BYTE 0
#endif
extern err_set msgset;
Index: src/usr.bin/xlint/lint1/mem1.c
diff -u src/usr.bin/xlint/lint1/mem1.c:1.56 src/usr.bin/xlint/lint1/mem1.c:1.57
--- src/usr.bin/xlint/lint1/mem1.c:1.56 Tue Dec 21 15:24:28 2021
+++ src/usr.bin/xlint/lint1/mem1.c Sat Dec 25 13:51:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem1.c,v 1.56 2021/12/21 15:24:28 rillig Exp $ */
+/* $NetBSD: mem1.c,v 1.57 2021/12/25 13:51:42 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.56 2021/12/21 15:24:28 rillig Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.57 2021/12/25 13:51:42 rillig Exp $");
#endif
#include <sys/param.h>
@@ -276,7 +276,8 @@ xfreeblk(memory_block **fmbp)
*fmbp = mb->next;
mb->next = frmblks;
frmblks = mb;
- (void)memset(mb->start, ZERO, mb->size - mb->nfree);
+ (void)memset(mb->start, INVALID_MEM_BYTE,
+ mb->size - mb->nfree);
}
}
