From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 9BA8B385222C for ; Wed, 14 Dec 2022 19:46:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9BA8B385222C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x131.google.com with SMTP id j28so7074233ila.9 for ; Wed, 14 Dec 2022 11:46:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KEYfWJvvzCpnfHzN4RvdcE3JOmMAjkmZmS5AOvvkfcg=; b=I9NDiyJzGqBL4joJy70hohGfAYwIr1g7uNLPyWAryPc+jLOJw2uaB1cHLbnvrhZmJ4 psuUStb/JGqlE9KEq42uMapfn4ZQtYMFzAkRR0HlPHzDuR3egDQ+txRKJ6LlAUeW+r/d kgGzIL2Nf9J8q6Ic/d1hnrmevrg28X6LkOmILVKNaCatULq+4rnNuD5knicab/RMGeYt kIJCIvo677GaxwG/p9HOhtgORKZsdCzTwjuBjcJVZx+k9kFXKzP6qFVcENzttAGKQDzT JAm4QHQq/o5HU7ng6Jpa+nssP4m0KDf4ADhN//gG6Z1oSzYdsW59s23sUZLuLoA5KMdm gr8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KEYfWJvvzCpnfHzN4RvdcE3JOmMAjkmZmS5AOvvkfcg=; b=fAcdJ3Dk1TnPelO4hpn96YVg1Onen61nSAp8PUNxd2rRy7K3woqD/L7lsvZZSen/+t N37S3TVhLmPAz3okPaLKVi6VpJsHOzjwxjOctMfUpiafZaGR9WptYTHqWWpgxh0kfX1Y PnilVpCAUu8VNidjZCrTTJDtOLrtgy1vXPnShHdn64kA9xjIFSzYx5VSjIJUxFDvrn8Y kOf11HD6jDKVqYlwg8xz5KosEm+aj19aJvhnkLe/BvSQ1sbbzj5BjfE8jac7ycHgOXfa t+2yq7Zo31IlgOEf+6aV1/0nBVAWaDeGK7jyZGEsqoQknru79GIBAL8+z+2BxvyJiKB/ ZSKg== X-Gm-Message-State: ANoB5pmL9UgfiaY7Dm6X0nEuyA7lrDU31QcZrHCnsnQML3h96+HoeZyz prs9Lae9eE24XkQA+462aPfQgzY3hRQHTWev X-Google-Smtp-Source: AA0mqf5SWzYRNkanQPJLvyoL9eMRrygpdv2nGopayGVu8Sfc4WBwpVTT04CeZKVNN0MzoAzsUPgAPA== X-Received: by 2002:a05:6e02:20c9:b0:302:e08a:4cbc with SMTP id 9-20020a056e0220c900b00302e08a4cbcmr18943346ilq.23.1671047177650; Wed, 14 Dec 2022 11:46:17 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id t26-20020a02b19a000000b0036332a07adcsm1956460jah.173.2022.12.14.11.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 11:46:17 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/2] Move streq and compare_cstrings to gdbsupport Date: Wed, 14 Dec 2022 12:46:06 -0700 Message-Id: <20221214194606.4141035-3-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20221214194606.4141035-1-tromey@adacore.com> References: <20221214194606.4141035-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: It seems to me that streq and compare_cstrings belong near the other string utility functions in common-utils.h; and furthermore that streq ought to be inlined. This patch makes this change. --- gdb/utils.c | 8 -------- gdb/utils.h | 12 ------------ gdbsupport/common-utils.h | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/gdb/utils.c b/gdb/utils.c index 5c110daa4ae..74917f25ab9 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3099,14 +3099,6 @@ strcmp_iw_ordered (const char *string1, const char *string2) } } -/* See utils.h. */ - -bool -streq (const char *lhs, const char *rhs) -{ - return !strcmp (lhs, rhs); -} - static void diff --git a/gdb/utils.h b/gdb/utils.h index ad7c94988b7..509361dc429 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -98,18 +98,6 @@ extern int strcmp_iw (const char *string1, const char *string2); extern int strcmp_iw_ordered (const char *, const char *); -/* Return true if the strings are equal. */ - -extern bool streq (const char *, const char *); - -/* Compare C strings for std::sort. */ - -static inline bool -compare_cstrings (const char *str1, const char *str2) -{ - return strcmp (str1, str2) < 0; -} - /* Reset the prompt_for_continue clock. */ void reset_prompt_for_continue_wait_time (void); /* Return the time spent in prompt_for_continue. */ diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index 8a9448a638b..7f5ec584a2e 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -93,6 +93,22 @@ startswith (gdb::string_view string, gdb::string_view pattern) && strncmp (string.data (), pattern.data (), pattern.length ()) == 0); } +/* Return true if the strings are equal. */ + +static inline bool +streq (const char *lhs, const char *rhs) +{ + return !strcmp (lhs, rhs); +} + +/* Compare C strings for std::sort. */ + +static inline bool +compare_cstrings (const char *str1, const char *str2) +{ + return strcmp (str1, str2) < 0; +} + ULONGEST strtoulst (const char *num, const char **trailer, int base); /* Skip leading whitespace characters in INP, returning an updated -- 2.34.3