From 829b94dc988861179f09f56b6693c84fda02acd1 Mon Sep 17 00:00:00 2001 From: Kapil Porwal Date: Wed, 5 Jun 2024 15:52:30 +0000 Subject: treewide: Move skip_atoi function to commonlib BUG=none TEST=Build and verify on Screebo TEST=make unit-tests ``` $ make tests/commonlib/bsd/string-test [==========] tests_commonlib_bsd_string-test(tests): Running 1 test(s). [ RUN ] test_skip_atoi [ OK ] test_skip_atoi [==========] tests_commonlib_bsd_string-test(tests): 1 test(s) run. [ PASSED ] 1 test(s). ``` Change-Id: Ifaaa80d0c696a625592ce301f9e3eefb2b4dcd98 Signed-off-by: Maximilian Brune Reviewed-on: https://review.coreboot.org/c/coreboot/+/82910 Reviewed-by: Jakub Czapiga Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/commonlib/Makefile.mk | 4 ++++ src/commonlib/bsd/include/commonlib/bsd/string.h | 10 ++++++++++ src/commonlib/bsd/string.c | 15 +++++++++++++++ src/include/string.h | 8 +------- src/lib/string.c | 9 --------- 5 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 src/commonlib/bsd/include/commonlib/bsd/string.h create mode 100644 src/commonlib/bsd/string.c (limited to 'src') diff --git a/src/commonlib/Makefile.mk b/src/commonlib/Makefile.mk index 30aaddf2cc..00f3629c1e 100644 --- a/src/commonlib/Makefile.mk +++ b/src/commonlib/Makefile.mk @@ -65,3 +65,7 @@ decompressor-y += bsd/gcd.c all-y += bsd/gcd.c all-y += bsd/ipchksum.c + +decompressor-y += bsd/string.c +smm-y += bsd/string.c +all-y += bsd/string.c 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 0000000000..bbd4754800 --- /dev/null +++ b/src/commonlib/bsd/include/commonlib/bsd/string.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#ifndef _COMMONLIB_BSD_STRING_H_ +#define _COMMONLIB_BSD_STRING_H_ + +#include + +unsigned int skip_atoi(char **ptr); + +#endif /* _COMMONLIB_BSD_STRING_H_ */ diff --git a/src/commonlib/bsd/string.c b/src/commonlib/bsd/string.c new file mode 100644 index 0000000000..3286d41b1c --- /dev/null +++ b/src/commonlib/bsd/string.c @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#include +#include + +unsigned int skip_atoi(char **ptr) +{ + unsigned int result = 0; + char *str; + + for (str = *ptr; isdigit(str[0]); str++) + result = result * 10 + (str[0] - '0'); + *ptr = str; + return result; +} diff --git a/src/include/string.h b/src/include/string.h index 33f0dfe196..e752f8f531 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -3,6 +3,7 @@ #ifndef STRING_H #define STRING_H +#include #include void *memcpy(void *dest, const void *src, size_t n); @@ -36,11 +37,4 @@ long atol(const char *str); */ 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 - * undefined if it overruns the return type size. - */ -unsigned int skip_atoi(char **s); - #endif /* STRING_H */ diff --git a/src/lib/string.c b/src/lib/string.c index dd7d1512ea..d23ed1f7e5 100644 --- a/src/lib/string.c +++ b/src/lib/string.c @@ -125,15 +125,6 @@ int strncmp(const char *s1, const char *s2, int maxlen) return 0; } -unsigned int skip_atoi(char **s) -{ - unsigned int i = 0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - int strspn(const char *str, const char *spn) { int ret = 0; -- cgit v1.2.3