From: Ezekiel Newren <ezekielnewren@gmail.com>
Date: Wed, 29 Oct 2025 22:19:40 +0000 (+0000)
Subject: xdiff: use ssize_t for dstart/dend, make them last in xdfile_t
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fddf7dd3668e5bd9d6d1b3adaf0cc22f29deee0f;p=thirdparty%2Fgit.git

xdiff: use ssize_t for dstart/dend, make them last in xdfile_t

ssize_t is appropriate for dstart and dend because they both describe
positive or negative offsets relative to a pointer.

A future patch will move these fields to a different struct. Moving
them to the end of xdfile_t now, means the field order of xdfile_t will
be disturbed less.

Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/xdiff/xtypes.h b/xdiff/xtypes.h
index f145abba3e..7c8c057bca 100644
--- a/xdiff/xtypes.h
+++ b/xdiff/xtypes.h
@@ -47,10 +47,10 @@ typedef struct s_xrecord {
 typedef struct s_xdfile {
 	xrecord_t *recs;
 	long nrec;
-	long dstart, dend;
 	bool *changed;
 	long *rindex;
 	long nreff;
+	ptrdiff_t dstart, dend;
 } xdfile_t;
 
 typedef struct s_xdfenv {