kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

update-ref: pass end pointer instead of strbuf 

We currently pass both an `strbuf` containing the current command line
as well as the `next` pointer pointing to the first argument to
commands. This is both confusing and makes code more intertwined.
Convert this to use a simple pointer as well as a pointer pointing to
the end of the input as a preparatory step to line-wise reading of
stdin.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2020-04-02 09:09:48 +02:00 committed by Junio C Hamano
parent 5ae6c5a712
commit 804dba54f5
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/update-ref.c
View File

@ -95,7 +95,7 @@ static char *parse_refname(const char **next)
* provided but cannot be converted to a SHA-1, die. flags can * provided but cannot be converted to a SHA-1, die. flags can
* include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY. * include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY.
*/ */
static int parse_next_oid(struct strbuf *input, const char **next, static int parse_next_oid(const char **next, const char *end,
struct object_id *oid, struct object_id *oid,
const char *command, const char *refname, const char *command, const char *refname,
int flags) int flags)
@ -103,7 +103,7 @@ static int parse_next_oid(struct strbuf *input, const char **next,
struct strbuf arg = STRBUF_INIT; struct strbuf arg = STRBUF_INIT;
int ret = 0; int ret = 0;


if (*next == input->buf + input->len) if (*next == end)
goto eof; goto eof;


if (line_termination) { if (line_termination) {
@ -128,7 +128,7 @@ static int parse_next_oid(struct strbuf *input, const char **next,
die("%s %s: expected NUL but got: %s", die("%s %s: expected NUL but got: %s",
command, refname, *next); command, refname, *next);
(*next)++; (*next)++;
if (*next == input->buf + input->len) if (*next == end)
goto eof; goto eof;
strbuf_addstr(&arg, *next); strbuf_addstr(&arg, *next);
*next += arg.len; *next += arg.len;
@ -179,7 +179,7 @@ static int parse_next_oid(struct strbuf *input, const char **next,
*/ */


static const char *parse_cmd_update(struct ref_transaction *transaction, static const char *parse_cmd_update(struct ref_transaction *transaction,
struct strbuf *input, const char *next) const char *next, const char *end)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -190,11 +190,11 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
if (!refname) if (!refname)
die("update: missing <ref>"); die("update: missing <ref>");


if (parse_next_oid(input, &next, &new_oid, "update", refname, if (parse_next_oid(&next, end, &new_oid, "update", refname,
PARSE_SHA1_ALLOW_EMPTY)) PARSE_SHA1_ALLOW_EMPTY))
die("update %s: missing <newvalue>", refname); die("update %s: missing <newvalue>", refname);


have_old = !parse_next_oid(input, &next, &old_oid, "update", refname, have_old = !parse_next_oid(&next, end, &old_oid, "update", refname,
PARSE_SHA1_OLD); PARSE_SHA1_OLD);


if (*next != line_termination) if (*next != line_termination)
@ -214,7 +214,7 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
} }


static const char *parse_cmd_create(struct ref_transaction *transaction, static const char *parse_cmd_create(struct ref_transaction *transaction,
struct strbuf *input, const char *next) const char *next, const char *end)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -224,7 +224,7 @@ static const char *parse_cmd_create(struct ref_transaction *transaction,
if (!refname) if (!refname)
die("create: missing <ref>"); die("create: missing <ref>");


if (parse_next_oid(input, &next, &new_oid, "create", refname, 0)) if (parse_next_oid(&next, end, &new_oid, "create", refname, 0))
die("create %s: missing <newvalue>", refname); die("create %s: missing <newvalue>", refname);


if (is_null_oid(&new_oid)) if (is_null_oid(&new_oid))
@ -246,7 +246,7 @@ static const char *parse_cmd_create(struct ref_transaction *transaction,
} }


static const char *parse_cmd_delete(struct ref_transaction *transaction, static const char *parse_cmd_delete(struct ref_transaction *transaction,
struct strbuf *input, const char *next) const char *next, const char *end)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -257,7 +257,7 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
if (!refname) if (!refname)
die("delete: missing <ref>"); die("delete: missing <ref>");


if (parse_next_oid(input, &next, &old_oid, "delete", refname, if (parse_next_oid(&next, end, &old_oid, "delete", refname,
PARSE_SHA1_OLD)) { PARSE_SHA1_OLD)) {
have_old = 0; have_old = 0;
} else { } else {
@ -282,7 +282,7 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
} }


static const char *parse_cmd_verify(struct ref_transaction *transaction, static const char *parse_cmd_verify(struct ref_transaction *transaction,
struct strbuf *input, const char *next) const char *next, const char *end)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -292,7 +292,7 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
if (!refname) if (!refname)
die("verify: missing <ref>"); die("verify: missing <ref>");


if (parse_next_oid(input, &next, &old_oid, "verify", refname, if (parse_next_oid(&next, end, &old_oid, "verify", refname,
PARSE_SHA1_OLD)) PARSE_SHA1_OLD))
oidclr(&old_oid); oidclr(&old_oid);


@ -311,7 +311,7 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
} }


static const char *parse_cmd_option(struct ref_transaction *transaction, static const char *parse_cmd_option(struct ref_transaction *transaction,
struct strbuf *input, const char *next) const char *next, const char *end)
{ {
const char *rest; const char *rest;
if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination) if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
@ -323,7 +323,7 @@ static const char *parse_cmd_option(struct ref_transaction *transaction,


static const struct parse_cmd { static const struct parse_cmd {
const char *prefix; const char *prefix;
const char *(*fn)(struct ref_transaction *, struct strbuf *, const char *); const char *(*fn)(struct ref_transaction *, const char *, const char *);
} command[] = { } command[] = {
{ "update", parse_cmd_update }, { "update", parse_cmd_update },
{ "create", parse_cmd_create }, { "create", parse_cmd_create },
@ -363,7 +363,7 @@ static void update_refs_stdin(struct ref_transaction *transaction)
if (!cmd) if (!cmd)
die("unknown command: %s", next); die("unknown command: %s", next);


next = cmd->fn(transaction, &input, next); next = cmd->fn(transaction, next, input.buf + input.len);
next++; next++;
} }