summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorYu-Ping Wu <yupingso@chromium.org>2024-08-05 03:58:56 +0000
committerYu-Ping Wu <yupingso@google.com>2024-08-14 03:09:20 +0000
commitaff734bc42b4e132abb5de0e44b0464dd4688590 (patch)
tree5ed1178030ddd3d660cd5d5304fe95dc009432ff /payloads
parent0dcdc0347c8d0405c1c6b444d23483dd9bf31d34 (diff)
commonlib/bsd: Add strcat() and strncat() functions
An upcoming vboot feature [1] will need strcat() to be defined in string.h. Therefore, add strcat() and strncat() to commonlib/bsd. Remove those functions from libpayload. [1] https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5650810 Change-Id: If02fce0eafb4f6fa01d8bab17d87a32360f4ac83 Signed-off-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/83765 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/include/string.h2
-rw-r--r--payloads/libpayload/libc/string.c40
2 files changed, 0 insertions, 42 deletions
diff --git a/payloads/libpayload/include/string.h b/payloads/libpayload/include/string.h
index 7762c36b67..b0028228eb 100644
--- a/payloads/libpayload/include/string.h
+++ b/payloads/libpayload/include/string.h
@@ -53,8 +53,6 @@ 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);
diff --git a/payloads/libpayload/libc/string.c b/payloads/libpayload/libc/string.c
index f9805e39bf..a1b7d4d59d 100644
--- a/payloads/libpayload/libc/string.c
+++ b/payloads/libpayload/libc/string.c
@@ -153,46 +153,6 @@ char *strcpy(char *d, const char *s)
}
/**
- * Concatenates two strings
- *
- * @param d The destination string.
- * @param s The source string.
- * @return A pointer to the destination string.
- */
-char *strcat(char *d, const char *s)
-{
- char *p = d + strlen(d);
- size_t sl = strlen(s);
-
- for (size_t i = 0; i < sl; i++)
- p[i] = s[i];
-
- p[sl] = '\0';
- return d;
-}
-
-/**
- * Concatenates two strings with a maximum length.
- *
- * @param d The destination string.
- * @param s The source string.
- * @param n Not more than n characters from s will be appended to d.
- * @return A pointer to the destination string.
- */
-char *strncat(char *d, const char *s, size_t n)
-{
- char *p = d + strlen(d);
- size_t sl = strlen(s);
- size_t max = n > sl ? sl : n;
-
- for (size_t i = 0; i < max; i++)
- p[i] = s[i];
-
- p[max] = '\0';
- return d;
-}
-
-/**
* Concatenates two strings with a maximum length.
*
* @param d The destination string.