On Fri, Nov 02, 2018 at 12:50:05PM -0700, Stefan Beller wrote: > > +/* > > + * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL > > + * one just sends the hunk line to the line_fn callback). > > + */ > > +void discard_hunk_line(void *, long, long, long, long, const char *, long); > > Recently we had the discussion on style and naming things. > On the one hand I don't know what these 4 different longs do, > so I'd wish for some descriptive variable names in here. > On the other hand the docs explain clearly why I don't need > to care (a no-op ignores all of the parameters, no need > to take care of their order)
Right, I actually did have the same thought while writing it. And ended up following that line of reasoning (since it's just a placeholder, it doesn't matter). But I'm not opposed to putting in the names. > So to revive that discussion, I would strongly prefer > to have *some* names there, for the sake of a > simply described coding style without many exceptions > (especially those exceptions that rely on judgement). Fair enough. Squashable patch is below; it goes on 34c829621e (diff: avoid generating unused hunk header lines, 2018-11-02). Junio, let me know if you'd prefer a re-send of the series, but it doesn't look necessary otherwise (so far). > Apart from that, I read the whole series, and found > it a pleasant read. Thanks! diff --git a/xdiff-interface.h b/xdiff-interface.h index 7b0ccbdd1d..8af245eed9 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -39,7 +39,9 @@ extern int git_xmerge_style; * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL * one just sends the hunk line to the line_fn callback). */ -void discard_hunk_line(void *, long, long, long, long, const char *, long); +void discard_hunk_line(void *priv, + long ob, long on, long nb, long nn, + const char *func, long funclen); /* * Compare the strings l1 with l2 which are of size s1 and s2 respectively. -Peff
