Module Name: src
Committed By: rillig
Date: Sat Aug 1 21:51:22 UTC 2020
Modified Files:
src/usr.bin/make: buf.c
Log Message:
make(1): remove redundant if clause from Buf_DestroyCompact
bmake_realloc can never return NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/make/buf.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/make/buf.c
diff -u src/usr.bin/make/buf.c:1.29 src/usr.bin/make/buf.c:1.30
--- src/usr.bin/make/buf.c:1.29 Sat Aug 1 21:40:49 2020
+++ src/usr.bin/make/buf.c Sat Aug 1 21:51:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.29 2020/08/01 21:40:49 rillig Exp $ */
+/* $NetBSD: buf.c,v 1.30 2020/08/01 21:51:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: buf.c,v 1.29 2020/08/01 21:40:49 rillig Exp $";
+static char rcsid[] = "$NetBSD: buf.c,v 1.30 2020/08/01 21:51:22 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: buf.c,v 1.29 2020/08/01 21:40:49 rillig Exp $");
+__RCSID("$NetBSD: buf.c,v 1.30 2020/08/01 21:51:22 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -219,11 +219,9 @@ Buf_DestroyCompact(Buffer *buf)
if (buf->size - buf->count >= BUF_COMPACT_LIMIT) {
/* We trust realloc to be smart */
Byte *data = bmake_realloc(buf->buffer, buf->count + 1);
- if (data) { /* XXX: can never be NULL */
- data[buf->count] = 0;
- Buf_Destroy(buf, FALSE);
- return data;
- }
+ data[buf->count] = 0;
+ Buf_Destroy(buf, FALSE);
+ return data;
}
#endif
return Buf_Destroy(buf, FALSE);
