Commit 1d802e24774c94ec7bdb12b6515226f3341533c1
Committed by
Martin Schwidefsky
Martin Schwidefsky
1 parent
8bcd9b04fd
Exists in
master
and in
7 other branches
[S390] Use strim instead of strstrip to avoid false warnings.
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Showing 4 changed files with 7 additions and 7 deletions Side-by-side Diff
arch/s390/hypfs/hypfs_diag.c
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | LPAR_NAME_LEN); |
| 165 | 165 | EBCASC(name, LPAR_NAME_LEN); |
| 166 | 166 | name[LPAR_NAME_LEN] = 0; |
| 167 | - strstrip(name); | |
| 167 | + strim(name); | |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | struct cpu_info { |
| ... | ... | @@ -523,7 +523,7 @@ |
| 523 | 523 | memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN), |
| 524 | 524 | CPU_NAME_LEN); |
| 525 | 525 | name[CPU_NAME_LEN] = 0; |
| 526 | - strstrip(name); | |
| 526 | + strim(name); | |
| 527 | 527 | return 0; |
| 528 | 528 | } |
| 529 | 529 |
arch/s390/hypfs/hypfs_vm.c
| ... | ... | @@ -124,7 +124,7 @@ |
| 124 | 124 | /* guest dir */ |
| 125 | 125 | memcpy(guest_name, data->guest_name, NAME_LEN); |
| 126 | 126 | EBCASC(guest_name, NAME_LEN); |
| 127 | - strstrip(guest_name); | |
| 127 | + strim(guest_name); | |
| 128 | 128 | guest_dir = hypfs_mkdir(sb, systems_dir, guest_name); |
| 129 | 129 | if (IS_ERR(guest_dir)) |
| 130 | 130 | return PTR_ERR(guest_dir); |
arch/s390/kernel/ipl.c
| ... | ... | @@ -221,7 +221,7 @@ |
| 221 | 221 | const char *buf, size_t len) \ |
| 222 | 222 | { \ |
| 223 | 223 | strncpy(_value, buf, sizeof(_value) - 1); \ |
| 224 | - strstrip(_value); \ | |
| 224 | + strim(_value); \ | |
| 225 | 225 | return len; \ |
| 226 | 226 | } \ |
| 227 | 227 | static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ |
| ... | ... | @@ -472,7 +472,7 @@ |
| 472 | 472 | return sprintf(page, "#unknown#\n"); |
| 473 | 473 | memcpy(loadparm, &sclp_ipl_info.loadparm, LOADPARM_LEN); |
| 474 | 474 | EBCASC(loadparm, LOADPARM_LEN); |
| 475 | - strstrip(loadparm); | |
| 475 | + strim(loadparm); | |
| 476 | 476 | return sprintf(page, "%s\n", loadparm); |
| 477 | 477 | } |
| 478 | 478 | |
| ... | ... | @@ -776,7 +776,7 @@ |
| 776 | 776 | memcpy(loadparm, ibp->ipl_info.ccw.load_parm, LOADPARM_LEN); |
| 777 | 777 | EBCASC(loadparm, LOADPARM_LEN); |
| 778 | 778 | loadparm[LOADPARM_LEN] = 0; |
| 779 | - strstrip(loadparm); | |
| 779 | + strim(loadparm); | |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | static ssize_t reipl_generic_loadparm_show(struct ipl_parameter_block *ipb, |
drivers/s390/char/tape_3590.c
| ... | ... | @@ -137,7 +137,7 @@ |
| 137 | 137 | out->type_on_tape = TAPE390_KEKL_TYPE_LABEL; |
| 138 | 138 | memcpy(out->label, in->label, sizeof(in->label)); |
| 139 | 139 | EBCASC(out->label, sizeof(in->label)); |
| 140 | - strstrip(out->label); | |
| 140 | + strim(out->label); | |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | static void int_to_ext_kekl_pair(struct tape3592_kekl_pair *in, |