git: 1364bc30deec - stable/14 - kern_malloc: remove '.' and '\n' from KASSERT/panic
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 28 Sep 2024 10:38:09 UTC
The branch stable/14 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=1364bc30deec992a3aee2bcec0ad4a3ceb0b8934
commit 1364bc30deec992a3aee2bcec0ad4a3ceb0b8934
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-07-23 18:27:46 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-09-28 10:35:11 +0000
kern_malloc: remove '.' and '\n' from KASSERT/panic
KASSERT and panic calls should not have a '.' at the end of the message
and do not need '\n'. Remove these.
No functional changes.
Reported by: markj (during review of D45812)
Sponsored by: The FreeBSD Foundation
Reviewed by: markj, kib
Differential Revision: https://reviews.freebsd.org/D46093
(cherry picked from commit c0df224ba5b1fe6257dd197f8298bf59fb6e520f)
---
sys/kern/kern_malloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 90fc88480a40..403f5fe11455 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -715,7 +715,7 @@ malloc_domain(size_t *sizep, int *indxp, struct malloc_type *mtp, int domain,
size = *sizep;
KASSERT(size <= kmem_zmax && (flags & M_EXEC) == 0,
- ("malloc_domain: Called with bad flag / size combination."));
+ ("malloc_domain: Called with bad flag / size combination"));
if (size & KMEM_ZMASK)
size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
indx = kmemsize[size >> KMEM_ZSHIFT];
@@ -998,7 +998,7 @@ zfree(void *addr, struct malloc_type *mtp)
vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
if (slab == NULL)
- panic("free: address %p(%p) has not been allocated.\n",
+ panic("free: address %p(%p) has not been allocated",
addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
switch (GET_SLAB_COOKIE(slab)) {
@@ -1164,7 +1164,7 @@ malloc_usable_size(const void *addr)
#else
vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
if (slab == NULL)
- panic("malloc_usable_size: address %p(%p) is not allocated.\n",
+ panic("malloc_usable_size: address %p(%p) is not allocated",
addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
switch (GET_SLAB_COOKIE(slab)) {