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:treewide:fix "Reference parameter to procedure is reassigned"

Browse Source 
Parameter's type which is pointer should not be changed in the
scope of function,assign it's value to local variable to fixed
it out.

Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi
2018-07-26 12:03:12 +08:00
committed by lijinxia
parent 9d4c9d769e
commit 59771ff461
23 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hypervisor/lib/sprintf.c
View File

@@ -83,8 +83,9 @@ static const char lower_hex_digits[] = {
'a', 'b', 'c', 'd', 'e', 'f', 'x'
};
static const char *get_param(const char *s, uint32_t *x)
static const char *get_param(const char *s_arg, uint32_t *x)
{
const char *s = s_arg;
*x = 0U;
/* ignore '-' for negative numbers, it will be handled in flags*/
@@ -102,8 +103,9 @@ static const char *get_param(const char *s, uint32_t *x)
return s;
}
static const char *get_flags(const char *s, uint32_t *flags)
static const char *get_flags(const char *s_arg, uint32_t *flags)
{
const char *s = s_arg;
/* contains the flag characters */
static const char flagchars[] = "#0- +";
/* contains the numeric flags for the characters above */
@@ -152,9 +154,10 @@ static const char *get_flags(const char *s, uint32_t *flags)
return s;
}
static const char *get_length_modifier(const char *s,
static const char *get_length_modifier(const char *s_arg,
uint32_t *flags, uint64_t *mask)
{
const char *s = s_arg;
if (*s == 'h') {
/* check for h[h] (char/short) */
s++;
@@ -460,9 +463,10 @@ static int print_string(struct print_param *param, const char *s)
return res;
}
int do_print(const char *fmt, struct print_param *param,
int do_print(const char *fmt_arg, struct print_param *param,
__builtin_va_list args)
{
const char *fmt = fmt_arg;
/* the result of this function */
int res = 0;
/* temp. storage for the next character */
@@ -616,8 +620,9 @@ int do_print(const char *fmt, struct print_param *param,
return res;
}
static int charmem(int cmd, const char *s, uint32_t sz, void *hnd)
static int charmem(int cmd, const char *s_arg, uint32_t sz, void *hnd)
{
const char *s = s_arg;
/* pointer to the snprint parameter list */
struct snprint_param *param = (struct snprint_param *) hnd;
/* pointer to the destination */
@@ -650,8 +655,10 @@ static int charmem(int cmd, const char *s, uint32_t sz, void *hnd)
return (int)n;
}
int vsnprintf(char *dst, size_t sz, const char *fmt, va_list args)
int vsnprintf(char *dst_arg, size_t sz_arg, const char *fmt, va_list args)
{
char *dst = dst_arg;
int32_t sz = sz_arg;
int res = 0;
if (sz == 0U || (dst == NULL)) {

26
hypervisor/lib/string.c
View File

@@ -153,8 +153,9 @@ int atoi(const char *str)
return (int)strtol_deci(str);
}
char *strchr(const char *s, int ch)
char *strchr(const char *s_arg, int ch)
{
const char *s = s_arg;
while ((*s != '\0') && (*s != ch)) {
++s;
}
@@ -184,13 +185,13 @@ char *strchr(const char *s, int ch)
* 1) both d and s shall not be null pointers.
* 2) dmax shall not 0.
*/
char *strcpy_s(char *d, size_t dmax, const char *s_arg)
char *strcpy_s(char *d_arg, size_t dmax, const char *s_arg)
{
char *d = d_arg;
const char *s = s_arg;
char *dest_base;
size_t dest_avail;
uint64_t overlap_guard;
const char *s = s_arg;
if (s == NULL || d == NULL || dmax == 0U) {
pr_err("%s: invalid src, dest buffer or length.", __func__);
@@ -261,8 +262,10 @@ char *strcpy_s(char *d, size_t dmax, const char *s_arg)
* 3) will assert() if overlap happens or dest buffer has no
* enough space.
*/
char *strncpy_s(char *d, size_t dmax, const char *s, size_t slen_arg)
char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg)
{
const char *s = s_arg;
char *d = d_arg;
char *dest_base;
size_t dest_avail;
uint64_t overlap_guard;
@@ -339,10 +342,11 @@ char *strncpy_s(char *d, size_t dmax, const char *s, size_t slen_arg)
* string length, excluding the null character.
* will return 0 if str is null.
*/
size_t strnlen_s(const char *str, size_t maxlen_arg)
size_t strnlen_s(const char *str_arg, size_t maxlen_arg)
{
size_t count;
const char *str = str_arg;
size_t maxlen = maxlen_arg;
size_t count;
if (str == NULL) {
return 0;
@@ -371,8 +375,10 @@ static char hexdigit(uint8_t decimal_val)
return hexdigits[decimal_val & 0x0FU];
}
int strcmp(const char *s1, const char *s2)
int strcmp(const char *s1_arg, const char *s2_arg)
{
const char *s1 = s1_arg;
const char *s2 = s2_arg;
while (((*s1) != '\0') && ((*s2) != '\0') && ((*s1) == (*s2))) {
s1++;
s2++;
@@ -381,8 +387,10 @@ int strcmp(const char *s1, const char *s2)
return *s1 - *s2;
}
int strncmp(const char *s1, const char *s2, size_t n_arg)
int strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg)
{
const char *s1 = s1_arg;
const char *s2 = s2_arg;
size_t n = n_arg;
while (((n - 1) != 0U) && ((*s1) != '\0') && ((*s2) != '\0')
&& ((*s1) == (*s2))) {