reflog: move "usage" variables and use macros

Move the "usage" variables in builtin/reflog.c to the top of the file,
in preparation for later commits defining a common "reflog_usage" in
terms of some of these strings, as was done in
8757b35d443 (commit-graph: define common usage with a macro,
2021-08-23).

While we're at it let's make them "const char *const", as is the
convention with these "usage" variables.

The use of macros here is a bit odd, but in subsequent commits we'll
make these use the same pattern as builtin/commit-graph.c uses since
8757b35d443 (commit-graph: define common usage with a macro,
2021-08-23).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/reflog.c b/builtin/reflog.c
index c864f276308290ef9a3b3f0bbe7731a61bf0e207..25313d504a91b42056da952cfb371f70c1835f44 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -5,8 +5,31 @@
 #include "worktree.h"
 #include "reflog.h"
 
+#define BUILTIN_REFLOG_EXPIRE_USAGE \
+       N_("git reflog expire [--expire=<time>] " \
+          "[--expire-unreachable=<time>] " \
+          "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] " \
+          "[--verbose] [--all] <refs>...")
+
+#define BUILTIN_REFLOG_DELETE_USAGE \
+       N_("git reflog delete [--rewrite] [--updateref] " \
+          "[--dry-run | -n] [--verbose] <refs>...")
+
+#define BUILTIN_REFLOG_EXISTS_USAGE \
+       N_("git reflog exists <ref>")
+
+static const char *const reflog_expire_usage[] = {
+       BUILTIN_REFLOG_EXPIRE_USAGE,
+       NULL
+};
+
+static const char *const reflog_delete_usage[] = {
+       BUILTIN_REFLOG_DELETE_USAGE,
+       NULL
+};
+
 static const char reflog_exists_usage[] =
-N_("git reflog exists <ref>");
+       BUILTIN_REFLOG_EXISTS_USAGE;
 
 static timestamp_t default_reflog_expire;
 static timestamp_t default_reflog_expire_unreachable;
@@ -147,14 +170,6 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, const char
                cb->expire_unreachable = default_reflog_expire_unreachable;
 }
 
-static const char * reflog_expire_usage[] = {
-       N_("git reflog expire [--expire=<time>] "
-          "[--expire-unreachable=<time>] "
-          "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
-          "[--verbose] [--all] <refs>..."),
-       NULL
-};
-
 static int expire_unreachable_callback(const struct option *opt,
                                 const char *arg,
                                 int unset)
@@ -304,12 +319,6 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
        return status;
 }
 
-static const char * reflog_delete_usage[] = {
-       N_("git reflog delete [--rewrite] [--updateref] "
-          "[--dry-run | -n] [--verbose] <refs>..."),
-       NULL
-};
-
 static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 {
        int i, status = 0;