git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] xdiffi.c: mark some file-local symbols as static
@ 2016-08-05 20:57 Ramsay Jones
  2016-08-11  8:52 ` Michael Haggerty
  0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2016-08-05 20:57 UTC (permalink / raw)
  To: Michael Haggerty; +Cc: Junio C Hamano, GIT Mailing-list


Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Michael,

If you need to re-roll your 'mh/diff-indent-heuristic' branch, could
you please squash this into the relevant patch (e199b6e2, "diff: improve
positioning of add/delete blocks in diffs", 04-08-2016).

Thanks!

ATB,
Ramsay Jones

 xdiff/xdiffi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 80307f5..90226f8 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -499,7 +499,7 @@ struct split_measurement {
 /*
  * Fill m with information about a hypothetical split of xdf above line split.
  */
-void measure_split(const xdfile_t *xdf, long split, struct split_measurement *m)
+static void measure_split(const xdfile_t *xdf, long split, struct split_measurement *m)
 {
 	long i;
 
@@ -557,7 +557,7 @@ void measure_split(const xdfile_t *xdf, long split, struct split_measurement *m)
  * Also see that project if you want to improve the weights based on, for example,
  * a larger or more diverse corpus.
  */
-int score_split(const struct split_measurement *m)
+static int score_split(const struct split_measurement *m)
 {
 	/*
 	 * A place to accumulate bonus factors (positive makes this index more
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] xdiffi.c: mark some file-local symbols as static
  2016-08-05 20:57 [PATCH] xdiffi.c: mark some file-local symbols as static Ramsay Jones
@ 2016-08-11  8:52 ` Michael Haggerty
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Haggerty @ 2016-08-11  8:52 UTC (permalink / raw)
  To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list

On 08/05/2016 10:57 PM, Ramsay Jones wrote:
> If you need to re-roll your 'mh/diff-indent-heuristic' branch, could
> you please squash this into the relevant patch (e199b6e2, "diff: improve
> positioning of add/delete blocks in diffs", 04-08-2016).

Will do. Thanks, Ramsay!

Michael



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-08-11  8:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-05 20:57 [PATCH] xdiffi.c: mark some file-local symbols as static Ramsay Jones
2016-08-11  8:52 ` Michael Haggerty

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).