ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lscpu: remove extra space from field key name 

The extra space was more obvious in json output.  But as the expected test
output displays also the standard output can be effected by this change.

    $ lscpu --json | jq '.lscpu | .[].field' | grep ': '
    "L1d cache: "
    "L1i cache: "
    "L2 cache: "
    "L3 cache: "
    "Vulnerability L1tf: "
    "Vulnerability Mds: "
    "Vulnerability Meltdown: "
    "Vulnerability Spec store bypass: "
    "Vulnerability Spectre v1: "
    "Vulnerability Spectre v2: "

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2019-05-16 21:51:47 +01:00
parent 4ac2ab97d1
commit 30d5ceeda8
No known key found for this signature in database
GPG Key ID: 0D46FEF7E61DBB46
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys-utils/lscpu.c
View File

@ -2117,7 +2117,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
tmp = size_to_human_string( tmp = size_to_human_string(
SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE, SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE,
sz); sz);
snprintf(buf, sizeof(buf), _("%s cache: "), ca->name); snprintf(buf, sizeof(buf), _("%s cache:"), ca->name);
add_summary_s(tb, buf, tmp); add_summary_s(tb, buf, tmp);
free(tmp); free(tmp);
} }
@ -2135,7 +2135,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
tmp = size_to_human_string( tmp = size_to_human_string(
SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE, SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE,
ca->size); ca->size);
snprintf(buf, sizeof(buf), _("%s cache: "), ca->name); snprintf(buf, sizeof(buf), _("%s cache:"), ca->name);
add_summary_s(tb, buf, tmp); add_summary_s(tb, buf, tmp);
free(tmp); free(tmp);
} }
@ -2154,7 +2154,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
if (desc->vuls) { if (desc->vuls) {
for (i = 0; i < desc->nvuls; i++) { for (i = 0; i < desc->nvuls; i++) {
snprintf(buf, sizeof(buf), ("Vulnerability %s: "), desc->vuls[i].name); snprintf(buf, sizeof(buf), ("Vulnerability %s:"), desc->vuls[i].name);
add_summary_s(tb, buf, desc->vuls[i].text); add_summary_s(tb, buf, desc->vuls[i].text);
} }
} }