From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A41EC77B61 for ; Mon, 10 Apr 2023 16:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbjDJQ0H (ORCPT ); Mon, 10 Apr 2023 12:26:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230201AbjDJQ0B (ORCPT ); Mon, 10 Apr 2023 12:26:01 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B25EA1727 for ; Mon, 10 Apr 2023 09:25:46 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54efad677cbso49167277b3.6 for ; Mon, 10 Apr 2023 09:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1681143946; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ltJwrJcS5zG2bCT4+GplpXfeO819XnkFUs/Trn7Oeps=; b=JOp/+aX/o5synz6pDxP1umm3bEXkb7P1Ea8j436nJfKATGjPyb6qB2aOkLPNVNcvj8 2maWSZuv2uiKpFb44vh5H7Qa3XdxdXS6evU1KNkO8gHiiN/fE09plTF+YNcDOuI+rke9 EUy9Q09MqBdqt4sduXNh44rI9+/qLZvJvFNsWaoSlV7MMcn1FkfZzB8NZcmYA5CpJVCH 31nfPzq/cONcl4BeaPjxpoNAr+9KUK6doWTQa2HktlaYXIfxXQ72Y4JmmEPBbfJafHFx j5xD9AG7NErwtUBDfVxXQv3oWjThGlizVMKIiAxKKD9AaCAVmicJjq4hNOebUyNKYmtg dbhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681143946; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ltJwrJcS5zG2bCT4+GplpXfeO819XnkFUs/Trn7Oeps=; b=Yh7wXMZkW+I4SbQrpLKxISuTBPci+BozHbz0NeJJxPtBzBMd+K2OHJm5UbUpO2niyT eYrWTu4B3gmuWpqDMif7UGFbfEtd/cz+jpQRoi6K9iMT/XIYpCWDKWNtEKzowVfaASbC +Opswi7WVdHae7AHZNmDPujG7IEc82dmGE1L9pXFENfGMJU6uyYRS/7bAHLHv1yZvdry TswRz6GXIjEdbDUhxpzQ+rc1epSCOUPEpbm5PmBpu2XJkq7zTDaDkKoRRAXgAuUKaGZu iQWeXdicCrMpQLuRyiMMoqrLjo8MsmathvKJxP+IiGWc16bHXh9YTZTgosKEFDT9nwoh ydBQ== X-Gm-Message-State: AAQBX9dCxaTSRDP+LHmSfeHZVY5wg254a4ckvHwvV8xxtPulQ2kZXRLJ qYP5HBWQ3hKTQm51557jBVrf9dHf1QVT X-Google-Smtp-Source: AKy350brhH8r3zG3fNPseFmqcLKPZ39CearAHRvBHkmjMWzSvwbZzj45ONsmp2U3Z0wDblFv+5IYvENPp9aw X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:fc51:6a03:541d:a18d]) (user=irogers job=sendgmr) by 2002:a05:6902:909:b0:a27:3ecc:ffe7 with SMTP id bu9-20020a056902090900b00a273eccffe7mr9982639ybb.3.1681143945997; Mon, 10 Apr 2023 09:25:45 -0700 (PDT) Date: Mon, 10 Apr 2023 09:25:07 -0700 In-Reply-To: <20230410162511.3055900-1-irogers@google.com> Message-Id: <20230410162511.3055900-3-irogers@google.com> Mime-Version: 1.0 References: <20230410162511.3055900-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog Subject: [PATCH v2 2/6] perf usage: Move usage strings From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The usage function is part of util.h, move the usage strings there too. Signed-off-by: Ian Rogers --- tools/perf/builtin-help.c | 1 + tools/perf/builtin.h | 3 --- tools/perf/perf.c | 6 ------ tools/perf/util/usage.c | 6 ++++++ tools/perf/util/util.h | 3 +++ 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index 3976aebe3677..3e7f52054fac 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -14,6 +14,7 @@ #include #include #include "util/debug.h" +#include "util/util.h" #include #include #include diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h index d03afea86217..f2ab5bae2150 100644 --- a/tools/perf/builtin.h +++ b/tools/perf/builtin.h @@ -2,9 +2,6 @@ #ifndef BUILTIN_H #define BUILTIN_H -extern const char perf_usage_string[]; -extern const char perf_more_info_string[]; - void list_common_cmds_help(void); const char *help_unknown_cmd(const char *cmd); diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 4b1b31e78332..997bb9ea5ebc 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -39,12 +39,6 @@ #include #include -const char perf_usage_string[] = - "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]"; - -const char perf_more_info_string[] = - "See 'perf help COMMAND' for more information on a specific command."; - static int use_pager = -1; const char *input_name; diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index 196438ee4c9d..4c8ffbad2323 100644 --- a/tools/perf/util/usage.c +++ b/tools/perf/util/usage.c @@ -12,6 +12,12 @@ #include #include +const char perf_usage_string[] = + "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]"; + +const char perf_more_info_string[] = + "See 'perf help COMMAND' for more information on a specific command."; + static __noreturn void usage_builtin(const char *err) { fprintf(stderr, "\n Usage: %s\n", err); diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 1d3b300af5a1..5010abf9e01e 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -15,6 +15,9 @@ #include #endif +extern const char perf_usage_string[]; +extern const char perf_more_info_string[]; + /* General helper functions */ void usage(const char *err) __noreturn; void die(const char *err, ...) __noreturn __printf(1, 2); -- 2.40.0.577.gac1e443424-goog