mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Jens Gustedt <Jens.Gustedt@inria.fr>
To: musl@lists.openwall.com
Subject: [musl] [C23 divers headers 05/17] C23: memccpy, strdup and strndup are now standard C
Date: Sat, 22 Apr 2023 22:06:13 +0200	[thread overview]
Message-ID: <1942ac523bf082de971930d58d531ba289f93a65.1684932861.git.Jens.Gustedt@inria.fr> (raw)
In-Reply-To: <cover.1684932861.git.Jens.Gustedt@inria.fr>

Just remove the feature guards around these. These guards had not even
strictly been necessary before, because prefixes mem and str are
reserved.
---
 include/string.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/string.h b/include/string.h
index db73d2a9..7df7a402 100644
--- a/include/string.h
+++ b/include/string.h
@@ -55,6 +55,10 @@ size_t strlen (const char *);
 
 char *strerror (int);
 
+char *strdup (const char *);
+char *strndup (const char *, size_t);
+void *memccpy (void *__restrict, const void *__restrict, int, size_t);
+
 #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #include <strings.h>
 #endif
@@ -67,8 +71,6 @@ int strerror_r (int, char *, size_t);
 char *stpcpy(char *__restrict, const char *__restrict);
 char *stpncpy(char *__restrict, const char *__restrict, size_t);
 size_t strnlen (const char *, size_t);
-char *strdup (const char *);
-char *strndup (const char *, size_t);
 char *strsignal(int);
 char *strerror_l (int, locale_t);
 int strcoll_l (const char *, const char *, locale_t);
@@ -76,11 +78,6 @@ size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
 void *memmem(const void *, size_t, const void *, size_t);
 #endif
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-void *memccpy (void *__restrict, const void *__restrict, int, size_t);
-#endif
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 char *strsep(char **, const char *);
 size_t strlcat (char *, const char *, size_t);
-- 
2.34.1

  parent reply	other threads:[~2023-05-24 14:05 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-24 12:54 [musl] [C23 divers headers 00/17] boring header update Jens Gustedt
2023-04-15 13:21 ` [musl] [C23 divers headers 02/17] C23: Add the *_WIDTH macros to stdint.h Jens Gustedt
2023-04-17  9:09 ` [musl] [C23 divers headers 03/17] C23: add call_once to stdlib.h Jens Gustedt
2023-05-24 14:23   ` Rich Felker
2023-04-17 19:52 ` [musl] [C23 divers headers 04/17] C23: add timegm, gmtime_r and localtime_r to time.h in C23 mode Jens Gustedt
2023-04-19  6:38 ` [musl] [C23 divers headers 15/17] C23: add the unreachable macro Jens Gustedt
2023-05-24 14:21   ` Rich Felker
2023-05-24 14:26     ` Jₑₙₛ Gustedt
2023-05-24 14:30       ` Rich Felker
2023-04-19  6:42 ` [musl] [C23 divers headers 16/17] C23: add the nullptr_t type Jens Gustedt
2023-05-24 14:22   ` Rich Felker
2023-05-24 14:29     ` Jₑₙₛ Gustedt
2023-05-24 14:34       ` Rich Felker
2023-05-24 14:42         ` Jₑₙₛ Gustedt
2023-05-24 14:49           ` Rich Felker
2023-05-24 15:24             ` Jₑₙₛ Gustedt
2023-04-19  6:46 ` [musl] [C23 divers headers 17/17] C23: add the __STDC_VERSION_STDDEF_H__ macro Jens Gustedt
2023-04-19  8:16 ` [musl] [C23 divers headers 09/17] C23: update stdbool.h Jens Gustedt
2023-04-19 11:48 ` [musl] [C23 divers headers 10/17] C23: remove the contents of stdalign.h Jens Gustedt
2023-05-24 14:25   ` Rich Felker
2023-04-19 11:59 ` [musl] [C23 divers headers 11/17] C23: remove the static_assert macro Jens Gustedt
2023-04-19 12:17 ` [musl] [C23 divers headers 12/17] C23: change the assert macro to ... arguments Jens Gustedt
2023-04-19 12:48 ` [musl] [C23 divers headers 13/17] C23: add the __STDC_VERSION_ASSERT_H__ macro Jens Gustedt
2023-04-19 13:02 ` [musl] [C23 divers headers 06/17] C23: adapt setjmp.h Jens Gustedt
2023-04-19 13:11 ` [musl] [C23 divers headers 07/17] C23: change the noreturn functions in stdlib.h Jens Gustedt
2023-04-19 13:17 ` [musl] [C23 divers headers 08/17] C23: change the noreturn function in threads.h Jens Gustedt
2023-04-19 13:56 ` [musl] [C23 divers headers 14/17] C23: allow va_start to receive only one argument Jens Gustedt
2023-04-21 11:33 ` [musl] [C23 divers headers 01/17] C23: add the WIDTH macros for the standard integer types Jens Gustedt
2023-04-22 20:06 ` Jens Gustedt [this message]
2023-05-31  9:22 [musl] [C23 divers headers 00/17] Jens Gustedt
2023-05-31  9:22 ` [musl] [C23 divers headers 05/17] C23: memccpy, strdup and strndup are now standard C Jens Gustedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1942ac523bf082de971930d58d531ba289f93a65.1684932861.git.Jens.Gustedt@inria.fr \
    --to=jens.gustedt@inria.fr \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).