From 50792cb98607835dba4b5ebf11df621fb0c7ee0c Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 23 Jun 2024 12:03:40 +0200 Subject: [PATCH] Remove unused alternative const safe sortix string functions. --- libc/include/features.h | 13 +------------ libc/include/string.h | 15 --------------- libc/string/strerror.c | 10 ++-------- libc/string/strerror_l.c | 12 +++--------- libc/string/strerror_r.c | 4 ++-- libc/string/strsignal.c | 10 ++-------- 6 files changed, 10 insertions(+), 54 deletions(-) diff --git a/libc/include/features.h b/libc/include/features.h index 9cc66388..559338dd 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2013, 2014 Jonas 'Sortie' Termansen. + * Copyright (c) 2011, 2012, 2013, 2014, 2024 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -69,7 +69,6 @@ #endif #if !defined(_SORTIX_SOURCE) #define _SORTIX_SOURCE 1 - #define __IMPLICIT_SORTIX_SOURCE #endif #endif @@ -90,7 +89,6 @@ /* Use the Sortix API if the default API was requested. */ #if defined(_DEFAULT_SOURCE) && !defined(_SORTIX_SOURCE) #define _SORTIX_SOURCE 1 - #define __IMPLICIT_SORTIX_SOURCE #endif /* Particular XSI revisions imply certain POSIX revisions. */ @@ -192,15 +190,6 @@ #define __USE_SORTIX 0 #endif -/* Whether to override some "standard" functions with Sortix alternatives. */ -#if !defined(__SORTIX_STDLIB_REDIRECTS) - #if __USE_SORTIX && !defined(__IMPLICIT_SORTIX_SOURCE) - #define __SORTIX_STDLIB_REDIRECTS 1 - #else - #define __SORTIX_STDLIB_REDIRECTS 0 - #endif -#endif - /* Provide the restrict keyword when building system components. */ #if defined(__is_sortix_system_component) && !defined(__want_restrict) #define __want_restrict 1 diff --git a/libc/include/string.h b/libc/include/string.h index eb01ba73..be4ac1a4 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -62,11 +62,7 @@ int strcmp(const char*, const char*); int strcoll(const char*, const char*); char* strcpy(char* __restrict, const char* __restrict); size_t strcspn(const char*, const char*); -#if __USE_SORTIX && __SORTIX_STDLIB_REDIRECTS -const char* strerror(int errnum) __asm__ ("sortix_strerror"); -#else char* strerror(int errnum); -#endif size_t strlen(const char*); char* strncat(char* __restrict, const char* __restrict, size_t); int strncmp(const char*, const char*, size_t); @@ -102,11 +98,7 @@ char* strdup(const char*); /* Functions from POSIX 2001. */ #if __USE_SORTIX || 200112L <= __USE_POSIX int ffs(int); -#if __USE_SORTIX && __SORTIX_STDLIB_REDIRECTS -const char* strerror_l(int, locale_t) __asm__ ("sortix_strerror_l"); -#else char* strerror_l(int, locale_t); -#endif int strerror_r(int, char*, size_t); char* strtok_r(char* __restrict, const char* __restrict, char** __restrict); #endif @@ -123,11 +115,7 @@ char* strndup_trace(struct __allocation_site*, const char*, size_t); char* strndup(const char*, size_t); #endif size_t strnlen(const char*, size_t); -#if __USE_SORTIX && __SORTIX_STDLIB_REDIRECTS -const char* strsignal(int signum) __asm__ ("sortix_strsignal"); -#else char* strsignal(int signum); -#endif size_t strxfrm_l(char* __restrict, const char* __restrict, size_t, locale_t); #endif @@ -150,9 +138,6 @@ int timingsafe_memcmp(const void*, const void*, size_t); /* Functions that are Sortix extensions. */ #if __USE_SORTIX int ffsll(long long int); -const char* sortix_strerror(int errnum); -const char* sortix_strerror_l(int, locale_t); -const char* sortix_strsignal(int signum); #endif #if __USE_SORTIX diff --git a/libc/string/strerror.c b/libc/string/strerror.c index 90071782..b11edd5d 100644 --- a/libc/string/strerror.c +++ b/libc/string/strerror.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016, 2020-2022 Jonas 'Sortie' Termansen. + * Copyright (c) 2011-2016, 2020-2022, 2024 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,11 +17,10 @@ * Convert error code to a string. */ -#define __SORTIX_STDLIB_REDIRECTS 0 #include #include -const char* sortix_strerror(int errnum) +char* strerror(int errnum) { switch ( errnum ) { @@ -115,8 +114,3 @@ const char* sortix_strerror(int errnum) default: return "Unknown error condition"; } } - -char* strerror(int errnum) -{ - return (char*) sortix_strerror(errnum); -} diff --git a/libc/string/strerror_l.c b/libc/string/strerror_l.c index 2dc0ed77..5f238fd0 100644 --- a/libc/string/strerror_l.c +++ b/libc/string/strerror_l.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Jonas 'Sortie' Termansen. + * Copyright (c) 2013, 2024 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,16 +17,10 @@ * Convert error code to a string. */ -#define __SORTIX_STDLIB_REDIRECTS 0 #include -const char* sortix_strerror_l(int errnum, locale_t locale) -{ - (void) locale; - return sortix_strerror(errnum); -} - char* strerror_l(int errnum, locale_t locale) { - return (char*) sortix_strerror_l(errnum, locale); + (void) locale; + return (char*) strerror(errnum); } diff --git a/libc/string/strerror_r.c b/libc/string/strerror_r.c index fdf9826f..a7cba7f1 100644 --- a/libc/string/strerror_r.c +++ b/libc/string/strerror_r.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2013, 2014 Jonas 'Sortie' Termansen. + * Copyright (c) 2011, 2012, 2013, 2014, 2024 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,7 +22,7 @@ int strerror_r(int errnum, char* dest, size_t dest_len) { - const char* msg = sortix_strerror(errnum); + const char* msg = strerror(errnum); if ( !msg ) return -1; if ( dest_len < strlen(msg) + 1 ) diff --git a/libc/string/strsignal.c b/libc/string/strsignal.c index b2156b46..d5f884c4 100644 --- a/libc/string/strsignal.c +++ b/libc/string/strsignal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014 Jonas 'Sortie' Termansen. + * Copyright (c) 2012, 2014, 2024 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,11 +17,10 @@ * Convert signal number to a string. */ -#define __SORTIX_STDLIB_REDIRECTS 0 #include #include -const char* sortix_strsignal(int signum) +char* strsignal(int signum) { switch ( signum ) { @@ -61,8 +60,3 @@ const char* sortix_strsignal(int signum) return "Unknown signal value"; } - -char* strsignal(int signum) -{ - return (char*) sortix_strsignal(signum); -}