From patchwork Mon May 4 12:34:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39205 From: gprocida@google.com (Giuliano Procida) Date: Mon, 4 May 2020 13:34:10 +0100 Subject: [PATCH v4 09/15] Refactor read_parameter_spec_from_string logic. In-Reply-To: <20200504123416.243214-1-gprocida@google.com> References: <20200424092132.150547-1-gprocida@google.com> <20200504123416.243214-1-gprocida@google.com> Message-ID: <20200504123416.243214-10-gprocida@google.com> This function extracts either a string or a regex from the same input. This patch simplifies the string vs regex conditional logic, in order to make following patches simpler. There are no behavioural changes. * src/abg-suppression.cc (read_parameter_spec_from_string): Use separate string and regex variables to simplify the creation of returned parameter specification. Reviewed-by: Matthias Maennich Signed-off-by: Giuliano Procida Acked-by: Dodji Seketeli --- src/abg-suppression.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc index c89201b6..4014ff06 100644 --- a/src/abg-suppression.cc +++ b/src/abg-suppression.cc @@ -3085,13 +3085,15 @@ read_parameter_spec_from_string(const string& str) if (!index_str.empty() || !type_name.empty()) { - function_suppression::parameter_spec* p; + std::string type_name_regex; if (is_regex) - p = new function_suppression::parameter_spec(atoi(index_str.c_str()), - "", type_name); - else - p = new function_suppression::parameter_spec(atoi(index_str.c_str()), - type_name, ""); + { + type_name_regex = type_name; + type_name.clear(); + } + function_suppression::parameter_spec* p = + new function_suppression::parameter_spec(atoi(index_str.c_str()), + type_name, type_name_regex); result.reset(p); }