summaryrefslogtreecommitdiff
path: root/dmiopt.c
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2008-10-30 07:50:22 +0000
committerJean Delvare <jdelvare@suse.de>2008-10-30 07:50:22 +0000
commitc641f2c7a23160620de3ad7575fc4a9d3c06befd (patch)
tree80ffde9804e27938a84c73c4fd722451a423283e /dmiopt.c
parent0ddfb04d22050d9476fdd34f2c596bab32525771 (diff)
downloaddmidecode-git-c641f2c7a23160620de3ad7575fc4a9d3c06befd.tar.gz
Option --dump is only a modifier as --quiet is, so it's not actually
mutually exclusive with the output format options.
Diffstat (limited to 'dmiopt.c')
-rw-r--r--dmiopt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dmiopt.c b/dmiopt.c
index 32053d9..a607028 100644
--- a/dmiopt.c
+++ b/dmiopt.c
@@ -282,12 +282,12 @@ int parse_command_line(int argc, char * const argv[])
/* Check for mutually exclusive output format options */
if ((opt.string != NULL) + (opt.type != NULL)
- + !!(opt.flags & FLAG_DUMP) + !!(opt.flags & FLAG_DUMP_BIN) > 1)
+ + !!(opt.flags & FLAG_DUMP_BIN) > 1)
{
- fprintf(stderr, "Options --string, --type, --dump and --dump-bin are mutually exclusive\n");
+ fprintf(stderr, "Options --string, --type and --dump-bin are mutually exclusive\n");
return -1;
}
- if (opt.flags & (FLAG_DUMP | FLAG_DUMP_BIN))
+ if (opt.flags & FLAG_DUMP_BIN)
opt.flags &= ~FLAG_QUIET;
if ((opt.flags & FLAG_FROM_DUMP) && (opt.flags & FLAG_DUMP_BIN))