Maximilian Brune has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79224?usp=email )
Change subject: treewide: Move string.h to commonlib ......................................................................
treewide: Move string.h to commonlib
This moves libpayloads string.h to commonlib/bsd/string.h and removes all function declarations that are duplicate of coreboots GPL2 licensed string.h and libpayloads string.h
Signed-off-by: Maximilian Brune maximilian.brune@9elements.com Change-Id: Ifb05d70e474ad2dc9e5d4726363ce01c70699f7f --- M payloads/libpayload/include/string.h A src/commonlib/bsd/include/commonlib/bsd/string.h M src/include/string.h 3 files changed, 57 insertions(+), 52 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/79224/1
diff --git a/payloads/libpayload/include/string.h b/payloads/libpayload/include/string.h index e87dea5..f5d7384 100644 --- a/payloads/libpayload/include/string.h +++ b/payloads/libpayload/include/string.h @@ -29,43 +29,19 @@ #ifndef _STRING_H #define _STRING_H
+#include <commonlib/bsd/string.h> #include <stddef.h>
/** - * @defgroup memory Memory manipulation functions - * @{ - */ -void *memset(void *s, int c, size_t n); -void *memcpy(void *dst, const void *src, size_t n); -void *memmove(void *dst, const void *src, size_t n); -void *memchr(const void *s, int c, size_t n); -int memcmp(const void *s1, const void *s2, size_t len); -/** @} */ - -/** * @defgroup string String functions * @{ */ -size_t strnlen(const char *str, size_t maxlen); -size_t strlen(const char *str); -int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, size_t maxlen); int strcasecmp(const char *s1, const char *s2); int strncasecmp(const char *s1, const char *s2, size_t maxlen); -char *strncpy(char *d, const char *s, size_t n); -char *strcpy(char *d, const char *s); char *strncat(char *d, const char *s, size_t n); char *strcat(char *d, const char *s); -char *strchr(const char *s, int c); -char *strrchr(const char *s, int c); -char *strdup(const char *s); char *strndup(const char *s, size_t size); -char *strstr(const char *h, const char *n); char *strsep(char **stringp, const char *delim); -size_t strspn(const char *s, const char *a); -size_t strcspn(const char *s, const char *a); -char *strtok(char *str, const char *delim); -char *strtok_r(char *str, const char *delim, char **ptr); char *strerror(int errnum); /** @} */
diff --git a/src/commonlib/bsd/include/commonlib/bsd/string.h b/src/commonlib/bsd/include/commonlib/bsd/string.h new file mode 100644 index 0000000..eafa77f --- /dev/null +++ b/src/commonlib/bsd/include/commonlib/bsd/string.h @@ -0,0 +1,55 @@ +/* + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _STRING_H +#define _STRING_H + +#include <stddef.h> + +void *memset(void *s, int c, size_t n); +void *memcpy(void *dst, const void *src, size_t n); +void *memmove(void *dst, const void *src, size_t n); +void *memchr(const void *s, int c, size_t n); +int memcmp(const void *s1, const void *s2, size_t len); + +size_t strnlen(const char *str, size_t maxlen); +size_t strlen(const char *str); +int strcmp(const char *s1, const char *s2); +int strncmp(const char *s1, const char *s2, size_t maxlen); +char *strncpy(char *d, const char *s, size_t n); +char *strcpy(char *d, const char *s); +char *strchr(const char *s, int c); +char *strrchr(const char *s, int c); +char *strdup(const char *s); +char *strstr(const char *h, const char *n); +size_t strspn(const char *s, const char *a); +size_t strcspn(const char *s, const char *a); +char *strtok(char *str, const char *delim); +char *strtok_r(char *str, const char *delim, char **ptr); + +#endif diff --git a/src/include/string.h b/src/include/string.h index 92ea5e5..74ccf91 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -3,41 +3,15 @@ #ifndef STRING_H #define STRING_H
+#include <commonlib/bsd/string.h> #include <stdarg.h> /* IWYU pragma: export */ #include <stddef.h> #include <stdio.h> /* IWYU pragma: export */
-void *memcpy(void *dest, const void *src, size_t n); -void *memmove(void *dest, const void *src, size_t n); -void *memset(void *s, int c, size_t n); -int memcmp(const void *s1, const void *s2, size_t n); -void *memchr(const void *s, int c, size_t n); -char *strdup(const char *s); char *strconcat(const char *s1, const char *s2); -size_t strnlen(const char *src, size_t max); -size_t strlen(const char *src); char *strchr(const char *s, int c); -char *strncpy(char *to, const char *from, int count); -char *strcpy(char *dst, const char *src); -int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, int maxlen); -int strspn(const char *str, const char *spn); -int strcspn(const char *str, const char *spn); -char *strstr(const char *haystack, const char *needle); -char *strtok_r(char *str, const char *delim, char **ptr); -char *strtok(char *str, const char *delim); long atol(const char *str);
-/** - * Find a character in a string. - * - * @param s The string. - * @param c The character. - * @return A pointer to the last occurrence of the character in the - * string, or NULL if the character was not encountered within the string. - */ -char *strrchr(const char *s, int c); - /* * Parses an unsigned integer and moves the input pointer forward to the first * character that's not a valid digit. s and *s must not be NULL. Result
-
Maximilian Brune (Code Review)