| Message ID | 20181008215701.779099-4-sandals@crustytoothpaste.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Hash function transition part 15 | expand |
On Mon, Oct 8, 2018 at 2:57 PM brian m. carlson <sandals@crustytoothpaste.net> wrote: > > Instead of using a hard-coded constant for the size of a hex object ID, > switch to use the computed pointer from parse_oid_hex that points after > the parsed object ID. > > Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> > --- > builtin/mktree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/mktree.c b/builtin/mktree.c > index 2dc4ad6ba8..94e82b8504 100644 > --- a/builtin/mktree.c > +++ b/builtin/mktree.c > @@ -98,7 +98,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss > > *ntr++ = 0; /* now at the beginning of SHA1 */ > > - path = ntr + 41; /* at the beginning of name */ > + path = (char *)p + 1; /* at the beginning of name */ ... and we need the cast to un-const p such that path takes it. Makes sense.
diff --git a/builtin/mktree.c b/builtin/mktree.c index 2dc4ad6ba8..94e82b8504 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -98,7 +98,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss *ntr++ = 0; /* now at the beginning of SHA1 */ - path = ntr + 41; /* at the beginning of name */ + path = (char *)p + 1; /* at the beginning of name */ if (!nul_term_line && path[0] == '"') { struct strbuf p_uq = STRBUF_INIT; if (unquote_c_style(&p_uq, path, NULL))
Instead of using a hard-coded constant for the size of a hex object ID, switch to use the computed pointer from parse_oid_hex that points after the parsed object ID. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- builtin/mktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)