Karthik Nayak <karthik.188@xxxxxxxxx> writes:
> On Thu, Sep 3, 2015 at 7:04 PM, Karthik Nayak <karthik.188@xxxxxxxxx> wrote:
>>> struct strbuf s = STRBUF_INIT;
>>> if (strtoul_ui(valp, 10, &v->u.contents.lines))
>>> die(_("positive width expected contents:lines=%s"), valp);
>>> - append_lines(&s, subpos, sublen + bodylen - siglen, v->u.contents.lines);
>>> + append_lines(&s, subpos, bodypos + bodylen - subpos, v->u.contents.lines);
>>> v->s = strbuf_detach(&s, NULL);
>>> }
>>> }
>
> append_lines(&s, subpos, bodylen + bodypos - subpos - siglen,
> v->u.contents.lines);
>
> We need to eliminate the signature if existing also.
Indeed. I thought body did not include the signature.
I'd write it as
bodylen + bodypos - siglen - subpos
or even
char *contents_end = bodylen + bodypos - siglen;
...
append_lines(&s, subpos, contents_end - subpos, ...);
to make it self-explanatory.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html