Module Name:    src
Committed By:   riastradh
Date:           Sun Mar 30 16:23:13 UTC 2025

Modified Files:
        src/lib/libc/gen: ctype_guard.h

Log Message:
ctype(3): Sprinkle _C_LABEL_STRING in a few more places.

Mostly for hygiene and to avoid raising questions about inconsistent
usage; this doesn't actually affect the build any more.

PR lib/58208: ctype(3) provides poor runtime feedback of abuse


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/ctype_guard.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/gen/ctype_guard.h
diff -u src/lib/libc/gen/ctype_guard.h:1.5 src/lib/libc/gen/ctype_guard.h:1.6
--- src/lib/libc/gen/ctype_guard.h:1.5	Sun Mar 30 16:17:05 2025
+++ src/lib/libc/gen/ctype_guard.h	Sun Mar 30 16:23:13 2025
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctype_guard.h,v 1.5 2025/03/30 16:17:05 riastradh Exp $	*/
+/*	$NetBSD: ctype_guard.h,v 1.6 2025/03/30 16:23:13 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2025 The NetBSD Foundation, Inc.
@@ -104,16 +104,17 @@
 
 #ifdef __arm__
 #  define	__ctype_table_object(name)				      \
-	__asm(".type " #name ",%object")
+	__asm(".type " _C_LABEL_STRING(#name) ",%object")
 #else
 #  define	__ctype_table_object(name)				      \
-	__asm(".type " #name ",@object")
+	__asm(".type " _C_LABEL_STRING(#name) ",@object")
 #endif
 
 #define	__ctype_table_size(name, guard, nelem, elemsize)		      \
 	__CTASSERT(sizeof((guard)[0]) == (elemsize));			      \
 	__CTASSERT(sizeof(guard) == _CTYPE_GUARD_SIZE + (nelem)*(elemsize));  \
-	__asm(".size " #name "," ___STRING((nelem) * (elemsize)))
+	__asm(".size " _C_LABEL_STRING(#name) ","			      \
+	    ___STRING((nelem) * (elemsize)))
 
 #if _CTYPE_GUARD_PAGE
 

Reply via email to