Adjust upstream PR 120
to keep output format: spaces around ' * ' Resolves: rhbz2224578
This commit is contained in:
parent
056fad2843
commit
191b393613
@ -136,10 +136,10 @@ index eb40b36..b43765a 100644
|
|||||||
- static char unitstr[16];
|
- static char unitstr[16];
|
||||||
+ /*
|
+ /*
|
||||||
+ * Twice as long as the longest possible unit name, plus
|
+ * Twice as long as the longest possible unit name, plus
|
||||||
+ * two characters for '%' and relation (either '*' or '/'),
|
+ * four characters for '%' and relation (either ' * ' or '/'),
|
||||||
+ * plus the terminating null-byte.
|
+ * plus the terminating null-byte.
|
||||||
+ */
|
+ */
|
||||||
+ static char unitstr[2 * UNIT_TYPE_LONGEST_NAME + 2 + 1];
|
+ static char unitstr[2 * UNIT_TYPE_LONGEST_NAME + 4 + 1];
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* By default, if units are supposed to be percent, we will pre-pend
|
* By default, if units are supposed to be percent, we will pre-pend
|
||||||
@ -171,7 +171,7 @@ index eb40b36..b43765a 100644
|
|||||||
+
|
+
|
||||||
+ switch (relation) {
|
+ switch (relation) {
|
||||||
+ case SDR_UNIT_MOD_MUL:
|
+ case SDR_UNIT_MOD_MUL:
|
||||||
+ snprintf(unitstr, sizeof (unitstr), "%s%s*%s",
|
+ snprintf(unitstr, sizeof (unitstr), "%s%s * %s",
|
||||||
+ pctstr, basestr, modstr);
|
+ pctstr, basestr, modstr);
|
||||||
break;
|
break;
|
||||||
- case 1:
|
- case 1:
|
||||||
|
Loading…
Reference in New Issue
Block a user