提交 1d802e24 编写于 作者: H Heiko Carstens 提交者: Martin Schwidefsky

[S390] Use strim instead of strstrip to avoid false warnings.

Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
上级 8bcd9b04
...@@ -164,7 +164,7 @@ static inline void part_hdr__part_name(enum diag204_format type, void *hdr, ...@@ -164,7 +164,7 @@ static inline void part_hdr__part_name(enum diag204_format type, void *hdr,
LPAR_NAME_LEN); LPAR_NAME_LEN);
EBCASC(name, LPAR_NAME_LEN); EBCASC(name, LPAR_NAME_LEN);
name[LPAR_NAME_LEN] = 0; name[LPAR_NAME_LEN] = 0;
strstrip(name); strim(name);
} }
struct cpu_info { struct cpu_info {
...@@ -523,7 +523,7 @@ static int diag224_idx2name(int index, char *name) ...@@ -523,7 +523,7 @@ static int diag224_idx2name(int index, char *name)
memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN), memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN),
CPU_NAME_LEN); CPU_NAME_LEN);
name[CPU_NAME_LEN] = 0; name[CPU_NAME_LEN] = 0;
strstrip(name); strim(name);
return 0; return 0;
} }
......
...@@ -124,7 +124,7 @@ static int hpyfs_vm_create_guest(struct super_block *sb, ...@@ -124,7 +124,7 @@ static int hpyfs_vm_create_guest(struct super_block *sb,
/* guest dir */ /* guest dir */
memcpy(guest_name, data->guest_name, NAME_LEN); memcpy(guest_name, data->guest_name, NAME_LEN);
EBCASC(guest_name, NAME_LEN); EBCASC(guest_name, NAME_LEN);
strstrip(guest_name); strim(guest_name);
guest_dir = hypfs_mkdir(sb, systems_dir, guest_name); guest_dir = hypfs_mkdir(sb, systems_dir, guest_name);
if (IS_ERR(guest_dir)) if (IS_ERR(guest_dir))
return PTR_ERR(guest_dir); return PTR_ERR(guest_dir);
......
...@@ -221,7 +221,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \ ...@@ -221,7 +221,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \
const char *buf, size_t len) \ const char *buf, size_t len) \
{ \ { \
strncpy(_value, buf, sizeof(_value) - 1); \ strncpy(_value, buf, sizeof(_value) - 1); \
strstrip(_value); \ strim(_value); \
return len; \ return len; \
} \ } \
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
...@@ -472,7 +472,7 @@ static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj, ...@@ -472,7 +472,7 @@ static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
return sprintf(page, "#unknown#\n"); return sprintf(page, "#unknown#\n");
memcpy(loadparm, &sclp_ipl_info.loadparm, LOADPARM_LEN); memcpy(loadparm, &sclp_ipl_info.loadparm, LOADPARM_LEN);
EBCASC(loadparm, LOADPARM_LEN); EBCASC(loadparm, LOADPARM_LEN);
strstrip(loadparm); strim(loadparm);
return sprintf(page, "%s\n", loadparm); return sprintf(page, "%s\n", loadparm);
} }
...@@ -776,7 +776,7 @@ static void reipl_get_ascii_loadparm(char *loadparm, ...@@ -776,7 +776,7 @@ static void reipl_get_ascii_loadparm(char *loadparm,
memcpy(loadparm, ibp->ipl_info.ccw.load_parm, LOADPARM_LEN); memcpy(loadparm, ibp->ipl_info.ccw.load_parm, LOADPARM_LEN);
EBCASC(loadparm, LOADPARM_LEN); EBCASC(loadparm, LOADPARM_LEN);
loadparm[LOADPARM_LEN] = 0; loadparm[LOADPARM_LEN] = 0;
strstrip(loadparm); strim(loadparm);
} }
static ssize_t reipl_generic_loadparm_show(struct ipl_parameter_block *ipb, static ssize_t reipl_generic_loadparm_show(struct ipl_parameter_block *ipb,
......
...@@ -137,7 +137,7 @@ static void int_to_ext_kekl(struct tape3592_kekl *in, ...@@ -137,7 +137,7 @@ static void int_to_ext_kekl(struct tape3592_kekl *in,
out->type_on_tape = TAPE390_KEKL_TYPE_LABEL; out->type_on_tape = TAPE390_KEKL_TYPE_LABEL;
memcpy(out->label, in->label, sizeof(in->label)); memcpy(out->label, in->label, sizeof(in->label));
EBCASC(out->label, sizeof(in->label)); EBCASC(out->label, sizeof(in->label));
strstrip(out->label); strim(out->label);
} }
static void int_to_ext_kekl_pair(struct tape3592_kekl_pair *in, static void int_to_ext_kekl_pair(struct tape3592_kekl_pair *in,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册