diff options
| author | Paul Eggert | 2025-06-27 22:32:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2025-06-27 23:06:40 -0700 |
| commit | dbdf761187d7cccfad20a2899bab3dc77f379c3a (patch) | |
| tree | d4e160b187f6f56e27dad185dfdd4cb955c4ec80 /lib/string.in.h | |
| parent | 68100ca656ad76e937622a1a74b6ca185bc82e07 (diff) | |
| download | emacs-dbdf761187d7cccfad20a2899bab3dc77f379c3a.tar.gz emacs-dbdf761187d7cccfad20a2899bab3dc77f379c3a.zip | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index e7642211685..e3d94b76c17 100644 --- a/lib/string.in.h +++ b/lib/string.in.h | |||
| @@ -215,25 +215,49 @@ _GL_EXTERN_C void free (void *); | |||
| 215 | /* Declarations for ISO C N3322. */ | 215 | /* Declarations for ISO C N3322. */ |
| 216 | #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__ | 216 | #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__ |
| 217 | _GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n) | 217 | _GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n) |
| 218 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 219 | _GL_ATTRIBUTE_NOTHROW | ||
| 220 | # endif | ||
| 218 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) | 221 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) |
| 219 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 222 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 220 | _GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n) | 223 | _GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n) |
| 224 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 225 | _GL_ATTRIBUTE_NOTHROW | ||
| 226 | # endif | ||
| 221 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4) | 227 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4) |
| 222 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4); | 228 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4); |
| 223 | _GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n) | 229 | _GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n) |
| 230 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 231 | _GL_ATTRIBUTE_NOTHROW | ||
| 232 | # endif | ||
| 224 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) | 233 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) |
| 225 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 234 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 226 | _GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n) | 235 | _GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n) |
| 236 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 237 | _GL_ATTRIBUTE_NOTHROW | ||
| 238 | # endif | ||
| 227 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) | 239 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) |
| 228 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 240 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 229 | _GL_EXTERN_C char *strndup (const char *__s, size_t __n) | 241 | _GL_EXTERN_C char *strndup (const char *__s, size_t __n) |
| 242 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 243 | _GL_ATTRIBUTE_NOTHROW | ||
| 244 | # endif | ||
| 230 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2); | 245 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2); |
| 231 | _GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n) | 246 | _GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n) |
| 247 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 248 | _GL_ATTRIBUTE_NOTHROW | ||
| 249 | # endif | ||
| 232 | _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 250 | _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 233 | _GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n) | 251 | _GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n) |
| 252 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 253 | _GL_ATTRIBUTE_NOTHROW | ||
| 254 | # endif | ||
| 234 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) | 255 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) |
| 235 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 256 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 236 | _GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n) | 257 | _GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n) |
| 258 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 259 | _GL_ATTRIBUTE_NOTHROW | ||
| 260 | # endif | ||
| 237 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) | 261 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) |
| 238 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); | 262 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); |
| 239 | # ifndef __cplusplus | 263 | # ifndef __cplusplus |
| @@ -243,6 +267,9 @@ _GL_EXTERN_C void *memrchr (const void *__s, int __c, size_t __n) | |||
| 243 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); | 267 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); |
| 244 | # endif | 268 | # endif |
| 245 | _GL_EXTERN_C void *memset (void *__s, int __c, size_t __n) | 269 | _GL_EXTERN_C void *memset (void *__s, int __c, size_t __n) |
| 270 | # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 | ||
| 271 | _GL_ATTRIBUTE_NOTHROW | ||
| 272 | # endif | ||
| 246 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); | 273 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); |
| 247 | _GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n) | 274 | _GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n) |
| 248 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); | 275 | _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); |