Module Name: src
Committed By: riastradh
Date: Thu Aug 15 15:46:40 UTC 2024
Modified Files:
src/lib/libc/locale: c16rtomb.c mbrtoc16.c mbrtoc32.c
Log Message:
libc: Use the more idiomatic alignof from stdalign.h.
No functional change intended.
PR lib/52374: <uchar.h> missing
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/locale/c16rtomb.c \
src/lib/libc/locale/mbrtoc16.c src/lib/libc/locale/mbrtoc32.c
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/locale/c16rtomb.c
diff -u src/lib/libc/locale/c16rtomb.c:1.1 src/lib/libc/locale/c16rtomb.c:1.2
--- src/lib/libc/locale/c16rtomb.c:1.1 Thu Aug 15 14:16:33 2024
+++ src/lib/libc/locale/c16rtomb.c Thu Aug 15 15:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: c16rtomb.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $ */
+/* $NetBSD: c16rtomb.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -66,11 +66,12 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: c16rtomb.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $");
+__RCSID("$NetBSD: c16rtomb.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $");
#include <assert.h>
#include <errno.h>
#include <limits.h>
+#include <stdalign.h>
#include <stddef.h>
#include <uchar.h>
@@ -83,7 +84,7 @@ struct c16rtombstate {
__CTASSERT(offsetof(struct c16rtombstate, mbs) <= sizeof(mbstate_t));
__CTASSERT(sizeof(struct c32rtombstate) <= sizeof(mbstate_t) -
offsetof(struct c16rtombstate, mbs));
-__CTASSERT(_Alignof(struct c16rtombstate) <= _Alignof(mbstate_t));
+__CTASSERT(alignof(struct c16rtombstate) <= alignof(mbstate_t));
size_t
c16rtomb(char *restrict s, char16_t c16, mbstate_t *restrict ps)
Index: src/lib/libc/locale/mbrtoc16.c
diff -u src/lib/libc/locale/mbrtoc16.c:1.1 src/lib/libc/locale/mbrtoc16.c:1.2
--- src/lib/libc/locale/mbrtoc16.c:1.1 Thu Aug 15 14:16:33 2024
+++ src/lib/libc/locale/mbrtoc16.c Thu Aug 15 15:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrtoc16.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $ */
+/* $NetBSD: mbrtoc16.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -73,10 +73,11 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mbrtoc16.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $");
+__RCSID("$NetBSD: mbrtoc16.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $");
#include <assert.h>
#include <errno.h>
+#include <stdalign.h>
#include <stddef.h>
#include <uchar.h>
@@ -89,7 +90,7 @@ struct mbrtoc16state {
__CTASSERT(offsetof(struct mbrtoc16state, mbs) <= sizeof(mbstate_t));
__CTASSERT(sizeof(struct mbrtoc32state) <= sizeof(mbstate_t) -
offsetof(struct mbrtoc16state, mbs));
-__CTASSERT(_Alignof(struct mbrtoc16state) <= _Alignof(mbstate_t));
+__CTASSERT(alignof(struct mbrtoc16state) <= alignof(mbstate_t));
size_t
mbrtoc16(char16_t *restrict pc16, const char *restrict s, size_t n,
Index: src/lib/libc/locale/mbrtoc32.c
diff -u src/lib/libc/locale/mbrtoc32.c:1.1 src/lib/libc/locale/mbrtoc32.c:1.2
--- src/lib/libc/locale/mbrtoc32.c:1.1 Thu Aug 15 14:16:33 2024
+++ src/lib/libc/locale/mbrtoc32.c Thu Aug 15 15:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrtoc32.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $ */
+/* $NetBSD: mbrtoc32.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mbrtoc32.c,v 1.1 2024/08/15 14:16:33 riastradh Exp $");
+__RCSID("$NetBSD: mbrtoc32.c,v 1.2 2024/08/15 15:46:40 riastradh Exp $");
#include <sys/param.h> /* MIN */
#include <sys/types.h> /* broken citrus_*.h */
@@ -63,6 +63,7 @@ __RCSID("$NetBSD: mbrtoc32.c,v 1.1 2024/
#include <langinfo.h>
#include <limits.h>
#include <paths.h>
+#include <stdalign.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -77,7 +78,7 @@ __RCSID("$NetBSD: mbrtoc32.c,v 1.1 2024/
#include "mbrtoc32.h"
__CTASSERT(sizeof(struct mbrtoc32state) <= sizeof(mbstate_t));
-__CTASSERT(_Alignof(struct mbrtoc32state) <= _Alignof(mbstate_t));
+__CTASSERT(alignof(struct mbrtoc32state) <= alignof(mbstate_t));
size_t
mbrtoc32(char32_t *restrict pc32, const char *restrict s, size_t n,
