e2fsprogs: code shrink

function                                             old     new   delta
print_e2flags_long                                     -     109    +109
list_attributes                                      248     232     -16
print_e2flags                                        169      47    -122
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 109/-138)          Total: -29 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-06-24 09:31:57 +02:00
parent 9468ea06d2
commit 87c40cf4de
3 changed files with 36 additions and 32 deletions

View File

@@ -98,36 +98,41 @@ static const char e2attr_flags_lname[] ALIGN1 =
"Verity" "\0"
/* Another trailing NUL is added by compiler */;
void print_e2flags(FILE *f, unsigned flags, unsigned options)
void print_e2flags_long(unsigned flags)
{
const uint32_t *fv;
const char *fn;
int first = 1;
fv = e2attr_flags_value;
fn = e2attr_flags_lname;
do {
if (flags & *fv) {
if (!first)
fputs(", ", stdout);
fputs(fn, stdout);
first = 0;
}
fv++;
fn += strlen(fn) + 1;
} while (*fn);
if (first)
fputs("---", stdout);
}
void print_e2flags(unsigned flags)
{
const uint32_t *fv;
const char *fn;
fv = e2attr_flags_value;
if (options & PFOPT_LONG) {
int first = 1;
fn = e2attr_flags_lname;
do {
if (flags & *fv) {
if (!first)
fputs(", ", f);
fputs(fn, f);
first = 0;
}
fv++;
fn += strlen(fn) + 1;
} while (*fn);
if (first)
fputs("---", f);
} else {
fn = e2attr_flags_sname;
do {
char c = '-';
if (flags & *fv)
c = *fn;
fputc(c, f);
fv++;
fn++;
} while (*fn);
}
fn = e2attr_flags_sname;
do {
char c = '-';
if (flags & *fv)
c = *fn;
putchar(c);
fv++;
fn++;
} while (*fn);
}