From 9e98eb72a7aeca4d95e17b5d518e2c5585113be7 Mon Sep 17 00:00:00 2001 From: fche Date: Wed, 18 Apr 2007 11:11:55 +0000 Subject: [PATCH] 2007-04-18 Frank Ch. Eigler * parse.cxx (scan_pp): Correct warnings from if/if/else nesting. --- ChangeLog | 4 ++++ parse.cxx | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff59f44b9..10e8d70a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-18 Frank Ch. Eigler + + * parse.cxx (scan_pp): Correct warnings from if/if/else nesting. + 2007-04-10 Martin Hunt * stp_check.in: Fixes to make sure debugfs or relayfs are mounted diff --git a/parse.cxx b/parse.cxx index a960e2498..9132d0b55 100644 --- a/parse.cxx +++ b/parse.cxx @@ -307,10 +307,10 @@ parser::scan_pp (bool expand_args) { m = scan_pp (result); // NB: recursive if (m == 0) - if (have_token) - throw parse_error ("incomplete conditional - missing %: or %)", t); - else - throw parse_error ("missing THEN tokens for conditional", t); + throw parse_error (have_token ? + "incomplete conditional - missing %: or %)" : + "missing THEN tokens for conditional", + t); have_token = true; if (m->type == tok_operator && (m->content == "%:" || // ELSE @@ -332,11 +332,11 @@ parser::scan_pp (bool expand_args) { m = scan_pp (expand_args && !result); // NB: recursive if (m == 0) - if (have_token) - throw parse_error ("incomplete conditional - missing %)", t); - else - throw parse_error ("missing ELSE tokens for conditional", t); - + throw parse_error (have_token ? + "incomplete conditional - missing %)" : + "missing ELSE tokens for conditional", + t); + have_token = true; if (m->type == tok_operator && m->content == "%)") // END break; -- 2.43.5