github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-03 17:31:42 +00:00
Code Issues Projects Releases Wiki Activity

hv: string: rename s1 and s2

Browse Source 
Commit 005546 introduces some functions like s0, s1, s2.
This patch renames `s1` and `s2` in string.c to avoid the name conflict.

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
This commit is contained in:
Shiqing Gao 2019-01-14 10:42:08 +08:00 committed by wenlingz
parent c11090215d
commit d5052abff9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hypervisor/lib/string.c
View File

@ -221,29 +221,30 @@ size_t strnlen_s(const char *str_arg, size_t maxlen_arg)
int32_t strcmp(const char *s1_arg, const char *s2_arg) int32_t strcmp(const char *s1_arg, const char *s2_arg)
{ {
const char *s1 = s1_arg; const char *str1 = s1_arg;
const char *s2 = s2_arg; const char *str2 = s2_arg;
while (((*s1) != '\0') && ((*s2) != '\0') && ((*s1) == (*s2))) {
s1++; while (((*str1) != '\0') && ((*str2) != '\0') && ((*str1) == (*str2))) {
s2++; str1++;
str2++;
} }
return *s1 - *s2; return *str1 - *str2;
} }
int32_t strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg) int32_t strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg)
{ {
const char *s1 = s1_arg; const char *str1 = s1_arg;
const char *s2 = s2_arg; const char *str2 = s2_arg;
size_t n = n_arg; size_t n = n_arg;
while (((n - 1) != 0U) && ((*s1) != '\0') && ((*s2) != '\0')
&& ((*s1) == (*s2))) { while (((n - 1) != 0U) && ((*str1) != '\0') && ((*str2) != '\0') && ((*str1) == (*str2))) {
s1++; str1++;
s2++; str2++;
n--; n--;
} }
return *s1 - *s2; return *str1 - *str2;
} }
/* /*