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

HV:treewide:fix "expression is not Boolean"

Browse Source 
MISRA C explicit required expression should be boolean when
in branch statements (if,while...).

Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi
2018-06-20 13:28:25 +08:00
committed by lijinxia
parent f92931c879
commit be0f5e6c16
17 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/lib/memory.c
View File

@@ -79,7 +79,7 @@ static void *allocate_mem(struct mem_pool *pool, unsigned int num_bytes)
for (bit_idx = ffz64(pool->bitmap[idx]);
bit_idx < BITMAP_WORD_SIZE; bit_idx++) {
/* Check if selected buffer is free */
if (pool->bitmap[idx] & (1 << bit_idx))
if ((pool->bitmap[idx] & (1 << bit_idx)) != 0U)
continue;
/* Declare temporary variables to be used locally in
@@ -105,7 +105,7 @@ static void *allocate_mem(struct mem_pool *pool, unsigned int num_bytes)
}
/* Break if selected buffer is not free */
if (pool->bitmap[tmp_idx] & (1 << tmp_bit_idx))
if ((pool->bitmap[tmp_idx] & (1 << tmp_bit_idx)) != 0U)
break;
}
@@ -201,13 +201,13 @@ static void deallocate_mem(struct mem_pool *pool, void *ptr)
contiguity_bitmask = &pool->contiguity_bitmap[bmp_idx];
/* Mark the buffer as free */
if (*bitmask & (1 << bit_idx))
if ((*bitmask & (1 << bit_idx)) != 0U)
*bitmask ^= (1 << bit_idx);
else
break;
/* Reset the Contiguity bit of buffer */
if (*contiguity_bitmask & (1 << bit_idx))
if ((*contiguity_bitmask & (1 << bit_idx)) != 0U)
*contiguity_bitmask ^= (1 << bit_idx);
else
break;
@@ -362,7 +362,7 @@ void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen)
/*small data block*/
if (slen < 8) {
while (slen) {
while (slen != 0U) {
*dest8++ = *src8++;
slen--;
}
@@ -372,7 +372,7 @@ void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen)
/*make sure 8bytes-aligned for at least one addr.*/
if ((!MEM_ALIGNED_CHECK(src8, 8)) && (!MEM_ALIGNED_CHECK(dest8, 8))) {
for (; slen && (((uint64_t)src8) & 7); slen--)
for (; slen != 0U && (((uint64_t)src8) & 7) != 0; slen--)
*dest8++ = *src8++;
}
@@ -389,7 +389,7 @@ void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen)
}
/*tail bytes*/
while (slen) {
while (slen != 0U) {
*dest8++ = *src8++;
slen--;
}
@@ -410,7 +410,7 @@ void *memset(void *base, uint8_t v, size_t n)
/*do the few bytes to get uint64_t alignment*/
count = n;
for (; count && ((uint64_t)dest_p & 7); count--)
for (; count != 0U && ((uint64_t)dest_p & 7) != 0U; count--)
*dest_p++ = v;
/*64-bit mode*/

58
hypervisor/lib/sprintf.c
View File

@@ -97,7 +97,7 @@ static const char *get_int(const char *s, int *x)
*x = *x * 10 + (*s++ - '0');
/* apply sign to result */
if (negative)
if (negative != 0)
*x = -*x;
return s;
@@ -118,7 +118,7 @@ static const char *get_flags(const char *s, int *flags)
const char *pos;
/* parse multiple flags */
while (*s) {
while ((*s) != 0) {
/* get index of flag. Terminate loop if no flag character was
* found
*/
@@ -132,11 +132,11 @@ static const char *get_flags(const char *s, int *flags)
}
/* Spec says that '-' has a higher priority than '0' */
if (*flags & PRINT_FLAG_LEFT_JUSTIFY)
if ((*flags & PRINT_FLAG_LEFT_JUSTIFY) != 0)
*flags &= ~PRINT_FLAG_PAD_ZERO;
/* Spec says that '+' has a higher priority than ' ' */
if (*flags & PRINT_FLAG_SIGN)
if ((*flags & PRINT_FLAG_SIGN) != 0)
*flags &= ~PRINT_FLAG_SPACE;
return s;
@@ -203,14 +203,14 @@ static int format_number(struct print_param *param)
* used for padding, the prefix is emitted after the padding.
*/
if (param->vars.flags & PRINT_FLAG_PAD_ZERO) {
if ((param->vars.flags & PRINT_FLAG_PAD_ZERO) != 0) {
/* use '0' for padding */
pad = '0';
/* emit prefix, return early if an error occurred */
res = param->emit(PRINT_CMD_COPY, param->vars.prefix,
param->vars.prefixlen, param->data);
if (param->vars.prefix && (res < 0))
if ((param->vars.prefix != NULL) && (res < 0))
return res;
/* invalidate prefix */
@@ -229,7 +229,7 @@ static int format_number(struct print_param *param)
/* emit prefix (if any), return early in case of an error */
res = param->emit(PRINT_CMD_COPY, param->vars.prefix,
param->vars.prefixlen, param->data);
if (param->vars.prefix && (res < 0))
if ((param->vars.prefix != NULL) && (res < 0))
return res;
/* insert additional 0's for precision, return early if an error
@@ -276,14 +276,14 @@ static int print_pow2(struct print_param *param,
mask = (1ULL << shift) - 1;
/* determine digit translation table */
digits = (param->vars.flags & PRINT_FLAG_UPPER) ?
digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0) ?
upper_hex_digits : lower_hex_digits;
/* apply mask for short/char */
v &= param->vars.mask;
/* determine prefix for alternate form */
if ((v == 0) && (param->vars.flags & PRINT_FLAG_ALTERNATE_FORM)) {
if ((v == 0) && ((param->vars.flags & PRINT_FLAG_ALTERNATE_FORM) != 0)) {
prefix[0] = '0';
param->vars.prefix = prefix;
param->vars.prefixlen = 1;
@@ -297,7 +297,7 @@ static int print_pow2(struct print_param *param,
/* determine digits from right to left */
do {
*--pos = digits[(v & mask)];
} while (v >>= shift);
} while ((v >>= shift) != 0);
/* assign parameter and apply width and precision */
param->vars.value = pos;
@@ -339,11 +339,11 @@ static int print_decimal(struct print_param *param, int64_t value)
}
/* determine sign if explicit requested in the format string */
if (!param->vars.prefix) {
if (param->vars.flags & PRINT_FLAG_SIGN) {
if (param->vars.prefix == NULL) {
if ((param->vars.flags & PRINT_FLAG_SIGN) != 0) {
param->vars.prefix = "+";
param->vars.prefixlen = 1;
} else if (param->vars.flags & PRINT_FLAG_SPACE) {
} else if ((param->vars.flags & PRINT_FLAG_SPACE) != 0) {
param->vars.prefix = " ";
param->vars.prefixlen = 1;
}
@@ -396,11 +396,11 @@ static int print_string(struct print_param *param, const char *s)
/* we need the length of the string if either width or precision is
* given
*/
if (param->vars.precision || param->vars.width)
if ((param->vars.precision != 0)|| (param->vars.width != 0))
len = strnlen_s(s, PRINT_STRING_MAX_LEN);
/* precision gives the max. number of characters to emit. */
if (param->vars.precision && (len > param->vars.precision))
if ((param->vars.precision != 0) && (len > param->vars.precision))
len = param->vars.precision;
/* calculate the number of additional characters to get the required
@@ -426,7 +426,7 @@ static int print_string(struct print_param *param, const char *s)
/* emit additional characters on the right, return early if an error
* occurred
*/
if (param->vars.flags & PRINT_FLAG_LEFT_JUSTIFY) {
if ((param->vars.flags & PRINT_FLAG_LEFT_JUSTIFY) != 0) {
res = param->emit(PRINT_CMD_FILL, " ", w, param->data);
if (res < 0)
return res;
@@ -446,11 +446,11 @@ int do_print(const char *fmt, struct print_param *param,
const char *start;
/* main loop: analyse until there are no more characters */
while (*fmt) {
while ((*fmt) != 0) {
/* mark the current position and search the next '%' */
start = fmt;
while (*fmt && (*fmt != '%'))
while (((*fmt) != 0) && (*fmt != '%'))
fmt++;
/*
@@ -500,8 +500,8 @@ int do_print(const char *fmt, struct print_param *param,
/* decimal number */
else if ((ch == 'd') || (ch == 'i')) {
res = print_decimal(param,
(param->vars.flags &
PRINT_FLAG_LONG_LONG) ?
((param->vars.flags &
PRINT_FLAG_LONG_LONG) != 0) ?
__builtin_va_arg(args,
long long)
: (long long)
@@ -512,8 +512,8 @@ int do_print(const char *fmt, struct print_param *param,
else if (ch == 'u') {
param->vars.flags |= PRINT_FLAG_UINT32;
res = print_decimal(param,
(param->vars.flags &
PRINT_FLAG_LONG_LONG) ?
((param->vars.flags &
PRINT_FLAG_LONG_LONG) != 0) ?
__builtin_va_arg(args,
unsigned long long)
: (unsigned long long)
@@ -523,8 +523,8 @@ int do_print(const char *fmt, struct print_param *param,
/* octal number */
else if (ch == 'o') {
res = print_pow2(param,
(param->vars.flags &
PRINT_FLAG_LONG_LONG) ?
((param->vars.flags &
PRINT_FLAG_LONG_LONG) != 0) ?
__builtin_va_arg(args,
unsigned long long)
: (unsigned long long)
@@ -537,8 +537,8 @@ int do_print(const char *fmt, struct print_param *param,
if (ch == 'X')
param->vars.flags |= PRINT_FLAG_UPPER;
res = print_pow2(param,
(param->vars.flags &
PRINT_FLAG_LONG_LONG) ?
((param->vars.flags &
PRINT_FLAG_LONG_LONG) != 0) ?
__builtin_va_arg(args,
unsigned long long)
: (unsigned long long)
@@ -599,7 +599,7 @@ static int charmem(int cmd, const char *s, int sz, void *hnd)
/* copy mode ? */
if (cmd == PRINT_CMD_COPY) {
if (sz < 0) {
while (*s) {
while ((*s) != 0) {
if (n < param->sz - param->wrtn)
*p = *s;
p++;
@@ -608,7 +608,7 @@ static int charmem(int cmd, const char *s, int sz, void *hnd)
}
} else if (sz > 0) {
while (*s && n < sz) {
while (((*s) != 0) && n < sz) {
if (n < param->sz - param->wrtn)
*p = *s;
p++;
@@ -636,7 +636,7 @@ int vsnprintf(char *dst, int sz, const char *fmt, va_list args)
/* the result of this function */
int res = 0;
if (sz <= 0 || !dst) {
if (sz <= 0 || (dst == NULL)) {
dst = c;
sz = 1;
}

38
hypervisor/lib/string.c
View File

@@ -222,7 +222,7 @@ strtol(const char *nptr, char **endptr, register int base)
*/
do {
c = *s++;
} while (ISSPACE(c));
} while (ISSPACE(c) != 0U);
if (c == '-') {
neg = 1;
c = *s++;
@@ -254,14 +254,14 @@ strtol(const char *nptr, char **endptr, register int base)
* Set any if any `digits' consumed; make it negative to indicate
* overflow.
*/
cutoff = neg ? -(uint64_t)LONG_MIN : LONG_MAX;
cutoff = (neg != 0) ? -(uint64_t)LONG_MIN : LONG_MAX;
cutlim = cutoff % (uint64_t)base;
cutoff /= (uint64_t)base;
for (acc = 0, any = 0;; c = *s++) {
if (ISDIGIT(c))
if (ISDIGIT(c) != 0U)
c -= '0';
else if (ISALPHA(c))
c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
else if (ISALPHA(c) != 0U)
c -= (ISUPPER(c) != 0U) ? 'A' - 10 : 'a' - 10;
else
break;
if (c >= base)
@@ -275,11 +275,11 @@ strtol(const char *nptr, char **endptr, register int base)
}
}
if (any < 0)
acc = neg ? LONG_MIN : LONG_MAX;
else if (neg)
acc = (neg != 0) ? LONG_MIN : LONG_MAX;
else if (neg != 0)
acc = -acc;
if (endptr != NULL)
*endptr = (char *) (any ? s - 1 : nptr);
*endptr = (char *) ((any != 0) ? s - 1 : nptr);
return acc;
}
@@ -303,7 +303,7 @@ strtoul(const char *nptr, char **endptr, register int base)
*/
do {
c = *s++;
} while (ISSPACE(c));
} while (ISSPACE(c) != 0U);
if (c == '-') {
neg = 1;
c = *s++;
@@ -320,10 +320,10 @@ strtoul(const char *nptr, char **endptr, register int base)
cutoff = (uint64_t)ULONG_MAX / (uint64_t)base;
cutlim = (uint64_t)ULONG_MAX % (uint64_t)base;
for (acc = 0, any = 0;; c = *s++) {
if (ISDIGIT(c))
if (ISDIGIT(c) != 0U)
c -= '0';
else if (ISALPHA(c))
c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
else if (ISALPHA(c) != 0U)
c -= (ISUPPER(c) != 0U) ? 'A' - 10 : 'a' - 10;
else
break;
if (c >= base)
@@ -338,10 +338,10 @@ strtoul(const char *nptr, char **endptr, register int base)
}
if (any < 0)
acc = ULONG_MAX;
else if (neg)
else if (neg != 0)
acc = -acc;
if (endptr != NULL)
*endptr = (char *) (any ? s - 1 : nptr);
*endptr = (char *) ((any != 0) ? s - 1 : nptr);
return acc;
}
@@ -353,10 +353,10 @@ atoi(const char *str)
char *strchr(const char *s, int ch)
{
while (*s && (*s != ch))
while ((*s != 0) && (*s != ch))
++s;
return (*s) ? ((char *)s) : 0;
return ((*s) != 0) ? ((char *)s) : 0;
}
/**
@@ -540,7 +540,7 @@ size_t strnlen_s(const char *str, size_t maxlen)
return 0;
count = 0;
while (*str) {
while ((*str) != 0) {
if (maxlen == 0)
break;
@@ -563,7 +563,7 @@ char hexdigit(int decimal_val)
int strcmp(const char *s1, const char *s2)
{
while (*s1 && *s2 && *s1 == *s2) {
while (((*s1) != 0) && ((*s2) != 0) && ((*s1) == (*s2))) {
s1++;
s2++;
}
@@ -573,7 +573,7 @@ int strcmp(const char *s1, const char *s2)
int strncmp(const char *s1, const char *s2, size_t n)
{
while (n - 1 && *s1 && *s2 && *s1 == *s2) {
while (((n - 1) != 0) && ((*s1) != 0) && ((*s2) != 0) && ((*s1) == (*s2))) {
s1++;
s2++;
n--;