[PATCH 3/3] index-pack, unpack-objects: use skip_prefix to avoid magic number
- From
Jeff King <peff@peff.net>
- Date
- Jan 17, 2025, 12:56 UTC
- Message-ID
- <20250117125647.GC2893666@coredump.intra.peff.net>
- In-Reply-To
- <20250117125207.GB2356599@coredump.intra.peff.net>
When parsing --pack_header=, we manually skip 14 bytes to the data. Let's use skip_prefix() to do this automatically.
Note that we overwrite our pointer to the front of the string, so we have to add more context to the error message. We could avoid this by declaring an extra pointer to hold the value, but I think the modified message is actually preferable. It should give translators a bit more context.
Signed-off-by: Jeff King <peff@peff.net> --- Just a cleanup I noticed in the area. It's possible that I'm overly annoyed by manual string counting and this is just churn, though. ;)
builtin/index-pack.c | 6 +++--- builtin/unpack-objects.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 75b84f78f4..0561eec00a 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1954,11 +1954,11 @@ int cmd_index_pack(int argc, warning(_("no threads support, ignoring %s"), arg); nr_threads = 1; } - } else if (starts_with(arg, "--pack_header=")) { - if (parse_pack_header_option(arg + 14, + } else if (skip_prefix(arg, "--pack_header=", &arg)) { + if (parse_pack_header_option(arg, input_buffer, &input_len) < 0) - die(_("bad %s"), arg); + die(_("bad --pack_header: %s"), arg); } else if (!strcmp(arg, "-v")) { verbose = 1; } else if (!strcmp(arg, "--progress-title")) { diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index cf2bc5c531..06d517dfb6 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -645,10 +645,10 @@ int cmd_unpack_objects(int argc, fsck_set_msg_types(&fsck_options, arg); continue; } - if (starts_with(arg, "--pack_header=")) { - if (parse_pack_header_option(arg + 14, + if (skip_prefix(arg, "--pack_header=", &arg)) { + if (parse_pack_header_option(arg, buffer, &len) < 0) - die(_("bad %s"), arg); + die(_("bad --pack_header: %s"), arg); continue; } if (skip_prefix(arg, "--max-input-size=", &arg)) {
-- 2.48.1.438.g7fbf7b046e