github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

acrn-hv: code review fix lib/string.c

Browse Source 
In lib/string.c, strncmp doesn't consider condition "n_arg=0",
just add a process to "n_arg=0".

Tracked-On: #4115
Signed-off-by: fuyanx <yanx.fu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
fuyanX 2019-07-25 23:24:33 +08:00 committed by wenlingz
parent aca51c0fad
commit 62e9d9bf75
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hypervisor/lib/string.c
View File

@ -313,19 +313,28 @@ int32_t strcmp(const char *s1_arg, const char *s2_arg)
return *s1 - *s2; return *s1 - *s2;
} }
/**
* *pre n_arg > 0
*/
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 *s1 = s1_arg;
const char *s2 = s2_arg; const char *s2 = s2_arg;
size_t n = n_arg; size_t n = n_arg;
while (((n - 1) != 0U) && ((*s1) != '\0') && ((*s2) != '\0') int32_t ret = 0;
&& ((*s1) == (*s2))) {
s1++; if (n > 0U) {
s2++; while (((n - 1) != 0U) && ((*s1) != '\0') && ((*s2) != '\0')
n--; && ((*s1) == (*s2))) {
s1++;
s2++;
n--;
}
ret = (int32_t)(*s1 - *s2);
} }
return *s1 - *s2; return ret;
} }
/* /*