Module Name: src
Committed By: riastradh
Date: Fri Jun 7 13:53:23 UTC 2024
Modified Files:
src/lib/libc/gen: isctype.c
src/lib/libc/locale: global_locale.c iswctype_mb.c multibyte.h
src/lib/libc/time: strftime.c strptime.c
Log Message:
libc/locale: Nix needless size_t casts.
No functional change intended. No binary change to aarch64 libc.
Prompted by code inspection around PR lib/58319.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/gen/isctype.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/locale/iswctype_mb.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/locale/multibyte.h
cvs rdiff -u -r1.55 -r1.56 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/time/strptime.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/gen/isctype.c
diff -u src/lib/libc/gen/isctype.c:1.25 src/lib/libc/gen/isctype.c:1.26
--- src/lib/libc/gen/isctype.c:1.25 Mon Aug 19 22:43:28 2013
+++ src/lib/libc/gen/isctype.c Fri Jun 7 13:53:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $ */
+/* $NetBSD: isctype.c,v 1.26 2024/06/07 13:53:22 riastradh Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $");
+__RCSID("$NetBSD: isctype.c,v 1.26 2024/06/07 13:53:22 riastradh Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -48,7 +48,7 @@ __RCSID("$NetBSD: isctype.c,v 1.25 2013/
#include "setlocale_local.h"
#define _RUNE_LOCALE(loc) \
- ((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))
+ ((_RuneLocale *)((loc)->part_impl[LC_CTYPE]))
#define _ISCTYPE_FUNC(name, bit) \
int \
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.27 src/lib/libc/locale/global_locale.c:1.28
--- src/lib/libc/locale/global_locale.c:1.27 Fri Jun 7 13:53:12 2024
+++ src/lib/libc/locale/global_locale.c Fri Jun 7 13:53:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.27 2024/06/07 13:53:12 riastradh Exp $ */
+/* $NetBSD: global_locale.c,v 1.28 2024/06/07 13:53:23 riastradh Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.27 2024/06/07 13:53:12 riastradh Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.28 2024/06/07 13:53:23 riastradh Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -143,26 +143,26 @@ struct _locale _lc_global_locale = {
.cache = &_C_cache,
.query = { _C_LOCALE },
.part_name = {
- [(size_t)LC_ALL ] = _lc_C_locale_name,
- [(size_t)LC_COLLATE ] = _lc_C_locale_name,
- [(size_t)LC_CTYPE ] = _lc_C_locale_name,
- [(size_t)LC_MONETARY] = _lc_C_locale_name,
- [(size_t)LC_NUMERIC ] = _lc_C_locale_name,
- [(size_t)LC_TIME ] = _lc_C_locale_name,
- [(size_t)LC_MESSAGES] = _lc_C_locale_name,
+ [LC_ALL ] = _lc_C_locale_name,
+ [LC_COLLATE ] = _lc_C_locale_name,
+ [LC_CTYPE ] = _lc_C_locale_name,
+ [LC_MONETARY] = _lc_C_locale_name,
+ [LC_NUMERIC ] = _lc_C_locale_name,
+ [LC_TIME ] = _lc_C_locale_name,
+ [LC_MESSAGES] = _lc_C_locale_name,
},
.part_impl = {
- [(size_t)LC_ALL ] = (_locale_part_t)NULL,
- [(size_t)LC_COLLATE ] = (_locale_part_t)NULL,
- [(size_t)LC_CTYPE ] = (_locale_part_t)
+ [LC_ALL ] = (_locale_part_t)NULL,
+ [LC_COLLATE ] = (_locale_part_t)NULL,
+ [LC_CTYPE ] = (_locale_part_t)
__UNCONST(&_DefaultRuneLocale),
- [(size_t)LC_MONETARY] = (_locale_part_t)
+ [LC_MONETARY] = (_locale_part_t)
__UNCONST(&_DefaultMonetaryLocale),
- [(size_t)LC_NUMERIC ] = (_locale_part_t)
+ [LC_NUMERIC ] = (_locale_part_t)
__UNCONST(&_DefaultNumericLocale),
- [(size_t)LC_MESSAGES] = (_locale_part_t)
+ [LC_MESSAGES] = (_locale_part_t)
__UNCONST(&_DefaultMessagesLocale),
- [(size_t)LC_TIME] = (_locale_part_t)
+ [LC_TIME] = (_locale_part_t)
__UNCONST(&_DefaultTimeLocale),
},
};
@@ -171,26 +171,26 @@ const struct _locale _lc_C_locale = {
.cache = &_C_cache,
.query = { _C_LOCALE },
.part_name = {
- [(size_t)LC_ALL ] = _lc_C_locale_name,
- [(size_t)LC_COLLATE ] = _lc_C_locale_name,
- [(size_t)LC_CTYPE ] = _lc_C_locale_name,
- [(size_t)LC_MONETARY] = _lc_C_locale_name,
- [(size_t)LC_NUMERIC ] = _lc_C_locale_name,
- [(size_t)LC_TIME ] = _lc_C_locale_name,
- [(size_t)LC_MESSAGES] = _lc_C_locale_name,
+ [LC_ALL ] = _lc_C_locale_name,
+ [LC_COLLATE ] = _lc_C_locale_name,
+ [LC_CTYPE ] = _lc_C_locale_name,
+ [LC_MONETARY] = _lc_C_locale_name,
+ [LC_NUMERIC ] = _lc_C_locale_name,
+ [LC_TIME ] = _lc_C_locale_name,
+ [LC_MESSAGES] = _lc_C_locale_name,
},
.part_impl = {
- [(size_t)LC_ALL ] = (_locale_part_t)NULL,
- [(size_t)LC_COLLATE ] = (_locale_part_t)NULL,
- [(size_t)LC_CTYPE ] = (_locale_part_t)
+ [LC_ALL ] = (_locale_part_t)NULL,
+ [LC_COLLATE ] = (_locale_part_t)NULL,
+ [LC_CTYPE ] = (_locale_part_t)
__UNCONST(&_DefaultRuneLocale),
- [(size_t)LC_MONETARY] = (_locale_part_t)
+ [LC_MONETARY] = (_locale_part_t)
__UNCONST(&_DefaultMonetaryLocale),
- [(size_t)LC_NUMERIC ] = (_locale_part_t)
+ [LC_NUMERIC ] = (_locale_part_t)
__UNCONST(&_DefaultNumericLocale),
- [(size_t)LC_MESSAGES] = (_locale_part_t)
+ [LC_MESSAGES] = (_locale_part_t)
__UNCONST(&_DefaultMessagesLocale),
- [(size_t)LC_TIME] = (_locale_part_t)
+ [LC_TIME] = (_locale_part_t)
__UNCONST(&_DefaultTimeLocale),
},
};
Index: src/lib/libc/locale/iswctype_mb.c
diff -u src/lib/libc/locale/iswctype_mb.c:1.13 src/lib/libc/locale/iswctype_mb.c:1.14
--- src/lib/libc/locale/iswctype_mb.c:1.13 Fri May 17 12:55:57 2013
+++ src/lib/libc/locale/iswctype_mb.c Fri Jun 7 13:53:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: iswctype_mb.c,v 1.13 2013/05/17 12:55:57 joerg Exp $ */
+/* $NetBSD: iswctype_mb.c,v 1.14 2024/06/07 13:53:23 riastradh Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype_mb.c,v 1.13 2013/05/17 12:55:57 joerg Exp $");
+__RCSID("$NetBSD: iswctype_mb.c,v 1.14 2024/06/07 13:53:23 riastradh Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -48,7 +48,7 @@ __RCSID("$NetBSD: iswctype_mb.c,v 1.13 2
#include "_wctrans_local.h"
#define _RUNE_LOCALE(loc) ((_RuneLocale const *) \
- (loc)->part_impl[(size_t)LC_CTYPE])
+ (loc)->part_impl[LC_CTYPE])
#define _ISWCTYPE_FUNC(name, index) \
int \
Index: src/lib/libc/locale/multibyte.h
diff -u src/lib/libc/locale/multibyte.h:1.7 src/lib/libc/locale/multibyte.h:1.8
--- src/lib/libc/locale/multibyte.h:1.7 Tue Jun 2 01:30:31 2020
+++ src/lib/libc/locale/multibyte.h Fri Jun 7 13:53:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte.h,v 1.7 2020/06/02 01:30:31 joerg Exp $ */
+/* $NetBSD: multibyte.h,v 1.8 2024/06/07 13:53:23 riastradh Exp $ */
/*-
* Copyright (c)2002 Citrus Project,
@@ -57,10 +57,10 @@ typedef union _RuneState {
#define _PRIVSIZE (sizeof(mbstate_t)-offsetof(_RuneStatePriv, __private))
#define _RUNE_LOCALE(loc) \
- ((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))
+ ((_RuneLocale *)((loc)->part_impl[LC_CTYPE]))
#define _CITRUS_CTYPE(loc) \
- (((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))->rl_citrus_ctype)
+ (((_RuneLocale *)((loc)->part_impl[LC_CTYPE]))->rl_citrus_ctype)
/* */
Index: src/lib/libc/time/strftime.c
diff -u src/lib/libc/time/strftime.c:1.55 src/lib/libc/time/strftime.c:1.56
--- src/lib/libc/time/strftime.c:1.55 Sun Feb 18 12:47:08 2024
+++ src/lib/libc/time/strftime.c Fri Jun 7 13:53:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: strftime.c,v 1.55 2024/02/18 12:47:08 kre Exp $ */
+/* $NetBSD: strftime.c,v 1.56 2024/06/07 13:53:23 riastradh Exp $ */
/* Convert a broken-down timestamp to a string. */
@@ -35,7 +35,7 @@
static char elsieid[] = "@(#)strftime.c 7.64";
static char elsieid[] = "@(#)strftime.c 8.3";
#else
-__RCSID("$NetBSD: strftime.c,v 1.55 2024/02/18 12:47:08 kre Exp $");
+__RCSID("$NetBSD: strftime.c,v 1.56 2024/06/07 13:53:23 riastradh Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,7 +81,7 @@ __weak_alias(strftime_z, _strftime_z)
#include "sys/localedef.h"
#define _TIME_LOCALE(loc) \
- ((_TimeLocale *)((loc)->part_impl[(size_t)LC_TIME]))
+ ((_TimeLocale *)((loc)->part_impl[LC_TIME]))
#define c_fmt d_t_fmt
enum warn { IN_NONE, IN_SOME, IN_THIS, IN_ALL };
Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.66 src/lib/libc/time/strptime.c:1.67
--- src/lib/libc/time/strptime.c:1.66 Mon Mar 18 16:15:24 2024
+++ src/lib/libc/time/strptime.c Fri Jun 7 13:53:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: strptime.c,v 1.66 2024/03/18 16:15:24 riastradh Exp $ */
+/* $NetBSD: strptime.c,v 1.67 2024/06/07 13:53:23 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.66 2024/03/18 16:15:24 riastradh Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.67 2024/06/07 13:53:23 riastradh Exp $");
#endif
#include "namespace.h"
@@ -55,7 +55,7 @@ static const u_char *find_string(const u
const char * const *, int);
#define _TIME_LOCALE(loc) \
- ((_TimeLocale *)((loc)->part_impl[(size_t)LC_TIME]))
+ ((_TimeLocale *)((loc)->part_impl[LC_TIME]))
/*
* We do not implement alternate representations. However, we always
