From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <35AuwXggKCrcdmolZfaXdlldib.ZljifYXYfdXfiplroZbtXob.lod@flex--gprocida.bounces.google.com> Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by sourceware.org (Postfix) with ESMTPS id A82B33870914 for ; Mon, 4 May 2020 12:34:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A82B33870914 Received: by mail-qk1-x749.google.com with SMTP id k138so18792056qke.15 for ; Mon, 04 May 2020 05:34:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=zT/VkewU3nF0b4BEcu51dj/x1JGbzHkqvtNreEtFkXI=; b=Xlj6C+/Ulm0F3kmr+OcFq159JcuQWgSdlolGoiNOZATtiTSzrAAlrxAB6upfnmyPqG PT4J8nSa2n4rYU6uX58Z4XG1UQrtaRmPwGNCA9RH2U6klCOd4WqFVf2D4K5JlAYbkuZ9 rOuA3msyPWhsI/Toh/GQl4zjzoBd74xYwikzm+7X49LK8RiaT6XwF7bKefS7UmpM+jwB 9ZG9jd/2QkeOlpAsNpTfqLZNbOQ3kfG0s5qhS5fDRLXdl7nevwUQTO+tmVGRSuWdA1A/ GOExw8ebeIVMbeCv/PRIh2e2OXufuedfd1tf2YmWA2iZwlMJsAiheECy9CvdqOqxOQx+ zLOg== X-Gm-Message-State: AGi0PuZUNvatu7MNvNvspc+K/kTOf0sWC6hGhrPiFgNUDVaGclghZxsq AVq16qzbtDDt3G/bZnU1wRNs1sef/EFvf/TMGasiSmt5sCN3qAcSa5h1zneRH4OJhlhREHNxZ5J uYyeWxeA76l0Bu5TrPiXBp5hAzkCb1D3NI6QIbI+nUvq7Xh3rxY4ox7JsMvFmMkioI7EvnJc= X-Google-Smtp-Source: APiQypI11oYogoL4ax08CleYo8mGmNplZRz5bM+8aHKDv+8SFV2PNADavYIvYy1PIqUjX4UVJe/nrtOkKX/GmQ== X-Received: by 2002:a0c:ea43:: with SMTP id u3mr14983796qvp.211.1588595684109; Mon, 04 May 2020 05:34:44 -0700 (PDT) Date: Mon, 4 May 2020 13:34:10 +0100 In-Reply-To: <20200504123416.243214-1-gprocida@google.com> Message-Id: <20200504123416.243214-10-gprocida@google.com> Mime-Version: 1.0 References: <20200424092132.150547-1-gprocida@google.com> <20200504123416.243214-1-gprocida@google.com> X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog Subject: [PATCH v4 09/15] Refactor read_parameter_spec_from_string logic. From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-34.0 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 12:34:45 -0000 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 --- 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); } -- 2.26.2.526.g744177e7f7-goog