Module Name: src
Committed By: riastradh
Date: Wed Jul 5 12:09:39 UTC 2023
Modified Files:
src/tests/lib/libc/stdlib: t_posix_memalign.c
Log Message:
t_posix_memalign: Simplify.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/stdlib/t_posix_memalign.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdlib/t_posix_memalign.c
diff -u src/tests/lib/libc/stdlib/t_posix_memalign.c:1.7 src/tests/lib/libc/stdlib/t_posix_memalign.c:1.8
--- src/tests/lib/libc/stdlib/t_posix_memalign.c:1.7 Wed Jul 5 11:43:05 2023
+++ src/tests/lib/libc/stdlib/t_posix_memalign.c Wed Jul 5 12:09:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_posix_memalign.c,v 1.7 2023/07/05 11:43:05 riastradh Exp $ */
+/* $NetBSD: t_posix_memalign.c,v 1.8 2023/07/05 12:09:39 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_posix_memalign.c,v 1.7 2023/07/05 11:43:05 riastradh Exp $");
+__RCSID("$NetBSD: t_posix_memalign.c,v 1.8 2023/07/05 12:09:39 riastradh Exp $");
#include <atf-c.h>
@@ -189,19 +189,11 @@ ATF_TC_BODY(aligned_alloc_basic, tc)
ATF_CHECK_EQ_MSG(p, NULL,
"aligned_alloc(%zu, %zu): %p, %s",
align[i], size[j], p, strerror(errno));
- switch (errno) {
- case EINVAL:
- case ENOMEM:
- break;
- default:
- atf_tc_fail_nonfatal(
- "%s:%d:"
- " aligned_alloc(%zu, %zu): %s",
- __FILE__, __LINE__,
- align[i], size[j],
- strerror(errno));
- break;
- }
+ ATF_CHECK_MSG((errno == EINVAL ||
+ errno == ENOMEM),
+ "aligned_alloc(%zu, %zu): %s",
+ align[i], size[j],
+ strerror(errno));
continue;
}
@@ -219,15 +211,10 @@ ATF_TC_BODY(aligned_alloc_basic, tc)
"aligned_alloc(%zu, %zu): %p",
align[i], size[j], p);
if (size[j] != 0) {
- if (p == NULL) {
- atf_tc_fail_nonfatal(
- "%s:%d:"
- " aligned_alloc(&p, %zu, %zu):"
- " %p, %s",
- __FILE__, __LINE__,
- align[i], size[j], p,
- strerror(errno));
- }
+ ATF_CHECK_MSG(p != NULL,
+ "aligned_alloc(&p, %zu, %zu): %p, %s",
+ align[i], size[j], p,
+ strerror(errno));
} else {
/*
* No guarantees about whether
