[PATCH v2 1/3] Use standard C string APIs in FDT helper

Abner Chang abner.chang at hpe.com
Sat Jul 25 05:30:39 EDT 2020


Use strncmp instead of using sbi_strcmp directly in fdthelp.c.
- This commit add implementation of sbi_strncmp.

Signed-off-by: Abner Chang <abner.chang at hpe.com>
Reviewed-by: Atish Patra <atish.patra at wdc.com>
Reviewed-by: Anup Patel <anup.patel at wdc.com>

Cc: Atish Patra <atish.patra at wdc.com>
Cc: Anup Patel <anup.patel at wdc.com>
Cc: Daniel Schaefer <daniel.schaefer at hpe.com>
---
 include/sbi/sbi_string.h |  7 +++++++
 lib/sbi/sbi_string.c     | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/include/sbi/sbi_string.h b/include/sbi/sbi_string.h
index 338075f..b7c2bc2 100644
--- a/include/sbi/sbi_string.h
+++ b/include/sbi/sbi_string.h
@@ -12,8 +12,15 @@
 
 #include <sbi/sbi_types.h>
 
+/*
+  Provides sbi_strcmp for the completeness of supporting string functions.
+  it is not recommended to use sbi_strcmp() but use sbi_strncmp instead.
+*/
+
 int sbi_strcmp(const char *a, const char *b);
 
+int sbi_strncmp(const char *a, const char *b, size_t count);
+
 size_t sbi_strlen(const char *str);
 
 size_t sbi_strnlen(const char *str, size_t count);
diff --git a/lib/sbi/sbi_string.c b/lib/sbi/sbi_string.c
index 38b700b..7805ba4 100644
--- a/lib/sbi/sbi_string.c
+++ b/lib/sbi/sbi_string.c
@@ -14,6 +14,10 @@
 
 #include <sbi/sbi_string.h>
 
+/*
+  Provides sbi_strcmp for the completeness of supporting string functions.
+  it is not recommended to use sbi_strcmp() but use sbi_strncmp instead.
+*/
 int sbi_strcmp(const char *a, const char *b)
 {
 	/* search first diff or end of string */
@@ -23,6 +27,15 @@ int sbi_strcmp(const char *a, const char *b)
 	return *a - *b;
 }
 
+int sbi_strncmp(const char *a, const char *b, size_t count)
+{
+	/* search first diff or end of string */
+	for (; count > 0 && *a == *b && *a != '\0'; a++, b++, count--)
+		;
+
+	return *a - *b;
+}
+
 size_t sbi_strlen(const char *str)
 {
 	unsigned long ret = 0;
-- 
2.25.0




More information about the opensbi mailing list