From: Tom de Vries <tdevries@suse.de>
To: dwz@sourceware.org, jakub@redhat.com
Subject: [committed] Simplify --odr/--no-odr parsing
Date: Wed, 01 Jan 2020 00:00:00 -0000 [thread overview]
Message-ID: <20200124104507.GA23839@delia> (raw)
Hi,
The --odr and --no-odr flags are currently setting odr_parsed and no_odr_parsed
variables, which in turn trigger setting the odr variable.
Simplify this by having the --odr and --no-odr flags set the odr variable
directly.
Committed to trunk.
Thanks,
- Tom
Simplify --odr/--no-odr parsing
2020-01-24 Tom de Vries <tdevries@suse.de>
(odr_parsed, no_odr_parsed): Remove variables.
(dwz_options): Use odr variable in --odr and --no-odr entries.
* dwz.c (main): Remove handling of odr_parsed and no_odr_parsed.
---
dwz.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/dwz.c b/dwz.c
index 7acbd30..e98310b 100644
--- a/dwz.c
+++ b/dwz.c
@@ -220,8 +220,6 @@ static enum die_count_methods die_count_method = estimate;
int odr = 1;
enum odr_mode { ODR_BASIC, ODR_LINK };
enum odr_mode odr_mode = ODR_LINK;
-int odr_parsed = 0;
-int no_odr_parsed = 0;
int odr_mode_parsed = 0;
/* Struct to gather statistics. */
@@ -14473,8 +14471,8 @@ static struct option dwz_options[] =
required_argument, &die_count_method_parsed, 1 },
{ "devel-stats", no_argument, &stats_p, 1 },
#endif
- { "odr", no_argument, &odr_parsed, 1 },
- { "no-odr", no_argument, &no_odr_parsed, 1 },
+ { "odr", no_argument, &odr, 1 },
+ { "no-odr", no_argument, &odr, 0 },
{ "odr-mode", required_argument, &odr_mode_parsed, 1 },
{ NULL, no_argument, 0, 0 }
};
@@ -14781,18 +14779,6 @@ main (int argc, char *argv[])
error (1, 0, "invalid argument --devel-die-count-method %s",
optarg);
}
- if (odr_parsed)
- {
- assert (!no_odr_parsed);
- odr = 1;
- odr_parsed = 0;
- }
- if (no_odr_parsed)
- {
- assert (!odr_parsed);
- odr = 0;
- no_odr_parsed = 0;
- }
if (odr_mode_parsed)
{
odr_mode_parsed = 0;
reply other threads:[~2020-01-24 10:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200124104507.GA23839@delia \
--to=tdevries@suse.de \
--cc=dwz@sourceware.org \
--cc=jakub@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).