github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-22 01:07:57 +00:00
Code Issues Projects Releases Wiki Activity

HV: Logical conjunction needs brackets

Browse Source 
The bracket is required when the level of precedence of
the operators is less than 13. Add the bracket to logical
conjunctions. The commit applys the rule to the files under

Signed-off-by: Yang, Yu-chu <yu-chu.yang@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Yang, Yu-chu
2018-07-25 14:55:25 -07:00
committed by wenlingz
parent 6f1c5fa007
commit 2fbf70780e
22 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/lib/memory.c
View File

@@ -357,7 +357,7 @@ void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen_arg)
uint8_t *src8;
size_t slen = slen_arg;
if (slen == 0U || dmax == 0U || dmax < slen) {
if ((slen == 0U) || (dmax == 0U) || (dmax < slen)) {
ASSERT(false);
}
@@ -388,7 +388,7 @@ void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen_arg)
/*make sure 8bytes-aligned for at least one addr.*/
if ((!MEM_ALIGNED_CHECK(src8, 8)) && (!MEM_ALIGNED_CHECK(dest8, 8))) {
for (; slen != 0U && (((uint64_t)src8) & 7UL) != 0UL; slen--) {
for (; (slen != 0U) && ((((uint64_t)src8) & 7UL) != 0UL); slen--) {
*dest8 = *src8;
dest8++;
src8++;
@@ -432,7 +432,7 @@ void *memset(void *base, uint8_t v, size_t n)
/*do the few bytes to get uint64_t alignment*/
count = n;
for (; count != 0U && ((uint64_t)dest_p & 7UL) != 0UL; count--) {
for (; (count != 0U) && (((uint64_t)dest_p & 7UL) != 0UL); count--) {
*dest_p = v;
dest_p++;
}

6
hypervisor/lib/sprintf.c
View File

@@ -432,7 +432,7 @@ static int print_string(struct print_param *param, const char *s)
/* calculate the number of additional characters to get the required
* width
*/
if (param->vars.width > 0U && param->vars.width > len) {
if ((param->vars.width > 0U) && (param->vars.width > len)) {
w = param->vars.width - len;
}
@@ -634,7 +634,7 @@ static int charmem(int cmd, const char *s_arg, uint32_t sz, void *hnd)
/* copy mode ? */
if (cmd == PRINT_CMD_COPY) {
if (sz > 0U) {
while (((*s) != '\0') && n < sz) {
while (((*s) != '\0') && (n < sz)) {
if (n < (param->sz - param->wrtn)) {
*p = *s;
}
@@ -662,7 +662,7 @@ int vsnprintf(char *dst_arg, size_t sz_arg, const char *fmt, va_list args)
int32_t sz = sz_arg;
int res = 0;
if (sz == 0U || (dst == NULL)) {
if ((sz == 0U) || (dst == NULL)) {
return -1;
}

20
hypervisor/lib/string.c
View File

@@ -64,10 +64,10 @@ long strtol_deci(const char *nptr)
acc = 0UL;
any = 0;
while (c >= '0' && c <= '9') {
while ((c >= '0') && (c <= '9')) {
c -= '0';
if ((acc > cutoff) ||
(acc == cutoff && (uint64_t)c > cutlim)) {
((acc == cutoff) && ((uint64_t)c > cutlim))) {
any = -1;
break;
} else {
@@ -109,7 +109,7 @@ uint64_t strtoul_hex(const char *nptr)
s++;
} while (ISSPACE(c));
if (c == '0' && (*s == 'x' || *s == 'X')) {
if ((c == '0') && ((*s == 'x') || (*s == 'X'))) {
c = s[1];
s += 2;
}
@@ -119,18 +119,18 @@ uint64_t strtoul_hex(const char *nptr)
acc = 0UL;
any = 0;
do {
if (c >= '0' && c <= '9') {
if ((c >= '0') && (c <= '9')) {
c -= '0';
} else if (c >= 'A' && c <= 'F') {
} else if ((c >= 'A') && (c <= 'F')) {
c -= 'A' - 10;
} else if (c >= 'a' && c <= 'f') {
} else if ((c >= 'a') && (c <= 'f')) {
c -= 'a' - 10;
} else {
break;
}
if ((acc > cutoff) ||
(acc == cutoff && (uint64_t)c > cutlim)) {
((acc == cutoff) && ((uint64_t)c > cutlim))) {
any = -1;
break;
} else {
@@ -193,7 +193,7 @@ char *strcpy_s(char *d_arg, size_t dmax, const char *s_arg)
size_t dest_avail;
uint64_t overlap_guard;
if (s == NULL || d == NULL || dmax == 0U) {
if ((s == NULL) || (d == NULL) || (dmax == 0U)) {
pr_err("%s: invalid src, dest buffer or length.", __func__);
return NULL;
}
@@ -271,12 +271,12 @@ char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg)
uint64_t overlap_guard;
size_t slen = slen_arg;
if (d == NULL || s == NULL) {
if ((d == NULL) || (s == NULL)) {
pr_err("%s: invlaid src or dest buffer", __func__);
return NULL;
}
if (dmax == 0U || slen == 0U) {
if ((dmax == 0U) || (slen == 0U)) {
pr_err("%s: invlaid length of src or dest buffer", __func__);
return NULL;
}