git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 00/10] Cleanup xdfile_t and xrecord_t in xdiff.

From
Ezekiel Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Sep 19, 2025, 15:16 UTC
Message-ID
<pull.2048.v3.git.git.1758294992.gitgitgadget@gmail.com>
In-Reply-To
<pull.2048.v2.git.git.1758239789.gitgitgadget@gmail.com>
Changes since v2.
 * No patch changes, just resending to get patch 9 to show up on the mailing
   list.
 * A few tweaks to the cover letter.
Changes since v1, to address review feedback.
 * Only include the clean up patches; The remaining patches will be split
   into a separate series.
 * Commit message clarifications.
 * Minor style cleanups.
 * Performance impacts included in commit message of patch 8.

Relevant part of the original cover letter follows: ===================================================

Before:
typedef struct s_xrecord {
	struct s_xrecord *next;
	char const *ptr;
	long size;
	unsigned long ha;
} xrecord_t;
typedef struct s_xdfile {
	chastore_t rcha;
	long nrec;
	unsigned int hbits;
	xrecord_t **rhash;
	long dstart, dend;
	xrecord_t **recs;
	char *rchg;
	long *rindex;
	long nreff;
	unsigned long *ha;
} xdfile_t;
After cleanup:
typedef struct s_xrecord {
	char const *ptr;
	long size;
	unsigned long ha;
} xrecord_t;
typedef struct s_xdfile {
	xrecord_t *recs;
	long nrec;
	long dstart, dend;
	char *rchg;
	long *rindex;
	long nreff;
} xdfile_t;
===
Ezekiel Newren (10):
  xdiff: delete static forward declarations in xprepare
  xdiff: delete local variables and initialize/free xdfile_t directly
  xdiff: delete unnecessary fields from xrecord_t and xdfile_t
  xdiff: delete xdl_get_rec() in xemit
  xdiff: delete struct diffdata_t
  xdiff: delete redundant array xdfile_t.ha
  xdiff: delete fields ha, line, size in xdlclass_t in favor of an
    xrecord_t
  xdiff: delete chastore from xdfile_t
  xdiff: delete rchg aliasing
  xdiff: treat xdfile_t.rchg like an enum
 xdiff/xdiff.h      |   4 +
 xdiff/xdiffi.c     | 101 ++++++++---------
 xdiff/xdiffi.h     |  11 +-
 xdiff/xemit.c      |  38 +++----
 xdiff/xhistogram.c |  10 +-
 xdiff/xmerge.c     |  56 +++++-----
 xdiff/xpatience.c  |  18 ++--
 xdiff/xprepare.c   | 262 +++++++++++++++++----------------------------
 xdiff/xtypes.h     |   7 +-
 xdiff/xutils.c     |  12 +--
 10 files changed, 212 insertions(+), 307 deletions(-)
base-commit: c44beea485f0f2feaf460e2ac87fdd5608d63cf0
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2048%2Fezekielnewren%2Fuse_rust_types_in_xdiff-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2048/ezekielnewren/use_rust_types_in_xdiff-v3
Pull-Request: https://github.com/git/git/pull/2048
Range-diff vs v2:
  1:  784cffcef5 =  1:  784cffcef5 xdiff: delete static forward declarations in xprepare
  2:  b79157e64f =  2:  b79157e64f xdiff: delete local variables and initialize/free xdfile_t directly
  3:  2e8de5be03 =  3:  2e8de5be03 xdiff: delete unnecessary fields from xrecord_t and xdfile_t
  4:  ddfee67e06 =  4:  ddfee67e06 xdiff: delete xdl_get_rec() in xemit
  5:  807ce3e5aa =  5:  807ce3e5aa xdiff: delete struct diffdata_t
  6:  0bacb1191d =  6:  0bacb1191d xdiff: delete redundant array xdfile_t.ha
  7:  e1e94107c9 =  7:  e1e94107c9 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t
  8:  fae26d2a04 =  8:  fae26d2a04 xdiff: delete chastore from xdfile_t
  9:  fd54135560 =  9:  fd54135560 xdiff: delete rchg aliasing
 10:  9a5ac3c488 = 10:  1e404c3290 xdiff: treat xdfile_t.rchg like an enum
-- 
gitgitgadget
Previous: Ezekiel NewrenNext: Ezekiel Newren via GitGitGadget
Message 51 of 158 in “Use rust types in xdiff.”
  1. 00/17 Use rust types in xdiff.Ezekiel Newren via GitGitGadget, Sep 7, 2025
  2. 01/17 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 7, 2025
  3. Elijah NewrenSep 9, 2025
  4. 02/17 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 7, 2025
  5. Elijah NewrenSep 9, 2025
  6. 03/17 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 7, 2025
  7. Elijah NewrenSep 9, 2025
  8. 04/17 xdiff: delete xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 7, 2025
  9. Elijah NewrenSep 9, 2025
  10. 05/17 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 7, 2025
  11. Elijah NewrenSep 9, 2025
  12. 06/17 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 7, 2025
  13. Elijah NewrenSep 9, 2025
  14. 07/17 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 7, 2025
  15. Elijah NewrenSep 9, 2025
  16. 08/17 xdiff: delete chastore from xdfile_t, view with --color-wordsEzekiel Newren via GitGitGadget, Sep 7, 2025
  17. Elijah NewrenSep 9, 2025
  18. Phillip WoodSep 9, 2025
  19. Junio C HamanoSep 9, 2025
  20. Ben KnobleSep 10, 2025
  21. 09/17 xdiff: treat xdfile_t.rchg like an enumEzekiel Newren via GitGitGadget, Sep 7, 2025
  22. Elijah NewrenSep 9, 2025
  23. 10/17 compat/rust_types.h: define rust primitive typesEzekiel Newren via GitGitGadget, Sep 7, 2025
  24. Junio C HamanoSep 8, 2025
  25. Ezekiel NewrenSep 8, 2025
  26. 11/17 xdiff: include compat/rust_types.hEzekiel Newren via GitGitGadget, Sep 7, 2025
  27. 12/17 xdiff: make xrecord_t.ptr a u8 instead of charEzekiel Newren via GitGitGadget, Sep 7, 2025
  28. 13/17 xdiff: make xrecord_t.size a usize instead of longEzekiel Newren via GitGitGadget, Sep 7, 2025
  29. 14/17 xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hashEzekiel Newren via GitGitGadget, Sep 7, 2025
  30. 15/17 xdiff: make xdfile_t.nrec a usize instead of longEzekiel Newren via GitGitGadget, Sep 7, 2025
  31. 16/17 xdiff: make xdfile_t.nreff a usize instead of longEzekiel Newren via GitGitGadget, Sep 7, 2025
  32. 17/17 xdiff: change the types of dstart, dend, rchg, and rindex in xdfile_tEzekiel Newren via GitGitGadget, Sep 7, 2025
  33. Junio C HamanoSep 16, 2025
  34. Ezekiel NewrenSep 16, 2025
  35. Elijah NewrenSep 17, 2025
  36. Junio C HamanoSep 17, 2025
  37. Junio C HamanoSep 17, 2025
  38. 00/10 Use rust types in xdiff.Ezekiel Newren via GitGitGadget, Sep 18, 2025
  39. 01/10 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 18, 2025
  40. 02/10 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 18, 2025
  41. 03/10 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 18, 2025
  42. 04/10 xdiff: delete xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 18, 2025
  43. 05/10 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 18, 2025
  44. 06/10 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 18, 2025
  45. 07/10 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 18, 2025
  46. 08/10 xdiff: delete chastore from xdfile_tEzekiel Newren via GitGitGadget, Sep 18, 2025
  47. 10/10 xdiff: treat xdfile_t.rchg like an enumEzekiel Newren via GitGitGadget, Sep 18, 2025
  48. Junio C HamanoSep 19, 2025
  49. Ezekiel NewrenSep 19, 2025
  50. Ezekiel NewrenSep 19, 2025
  51. 00/10 Cleanup xdfile_t and xrecord_t in xdiff.Ezekiel Newren via GitGitGadget, Sep 19, 2025
  52. 01/10 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 19, 2025
  53. Junio C HamanoSep 20, 2025
  54. Ezekiel NewrenSep 20, 2025
  55. Elijah NewrenSep 20, 2025
  56. Ben KnobleSep 20, 2025
  57. Junio C HamanoSep 20, 2025
  58. Ben KnobleSep 20, 2025
  59. Jeff KingSep 20, 2025
  60. Ben KnobleSep 20, 2025
  61. Junio C HamanoSep 20, 2025
  62. Jeff KingSep 20, 2025
  63. 02/10 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 19, 2025
  64. Junio C HamanoSep 20, 2025
  65. 03/10 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 19, 2025
  66. 04/10 xdiff: delete xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 19, 2025
  67. Junio C HamanoSep 20, 2025
  68. Phillip WoodSep 21, 2025
  69. Ezekiel NewrenSep 21, 2025
  70. 05/10 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 19, 2025
  71. Phillip WoodSep 21, 2025
  72. Ezekiel NewrenSep 21, 2025
  73. 06/10 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 19, 2025
  74. 07/10 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 19, 2025
  75. Phillip WoodSep 21, 2025
  76. Ezekiel NewrenSep 21, 2025
  77. 08/10 xdiff: delete chastore from xdfile_tEzekiel Newren via GitGitGadget, Sep 19, 2025
  78. 09/10 xdiff: delete rchg aliasingEzekiel Newren via GitGitGadget, Sep 19, 2025
  79. Phillip WoodSep 21, 2025
  80. Ezekiel NewrenSep 21, 2025
  81. 10/10 xdiff: treat xdfile_t.rchg like an enumEzekiel Newren via GitGitGadget, Sep 19, 2025
  82. Junio C HamanoSep 21, 2025
  83. Ezekiel NewrenSep 21, 2025
  84. Phillip WoodSep 21, 2025
  85. Ezekiel NewrenSep 21, 2025
  86. Elijah NewrenSep 19, 2025
  87. Ezekiel NewrenSep 19, 2025
  88. 00/12 Cleanup xdfile_t and xrecord_t in xdiff.Ezekiel Newren via GitGitGadget, Sep 22, 2025
  89. 01/12 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 22, 2025
  90. 02/12 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 22, 2025
  91. 03/12 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  92. 04/12 xdiff: delete superfluous function xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 22, 2025
  93. 05/12 xdiff: delete superfluous local variables that alias fields in xrecord_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  94. 06/12 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  95. 07/12 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 22, 2025
  96. 08/12 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  97. 09/12 xdiff: delete chastore from xdfile_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  98. 10/12 xdiff: delete rchg aliasingEzekiel Newren via GitGitGadget, Sep 22, 2025
  99. 11/12 xdiff: use bool literals for xdfile_t.rchgEzekiel Newren via GitGitGadget, Sep 22, 2025
  100. 12/12 xdiff: refactor 'char *rchg' to 'bool *changed' in xdfile_tEzekiel Newren via GitGitGadget, Sep 22, 2025
  101. Junio C HamanoSep 22, 2025
  102. Ezekiel NewrenSep 23, 2025
  103. Junio C HamanoSep 23, 2025
  104. Ezekiel NewrenSep 23, 2025
  105. Junio C HamanoSep 23, 2025
  106. Ezekiel NewrenSep 23, 2025
  107. 00/13 Cleanup xdfile_t and xrecord_t in xdiff.Ezekiel Newren via GitGitGadget, Sep 23, 2025
  108. 01/13 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 23, 2025
  109. 02/13 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 23, 2025
  110. 03/13 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  111. 04/13 xdiff: delete superfluous function xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 23, 2025
  112. Kristoffer HaugsbakkSep 30, 2025
  113. Ezekiel NewrenSep 30, 2025
  114. Junio C HamanoSep 30, 2025
  115. 05/13 xdiff: delete superfluous local variables that alias fields in xrecord_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  116. Phillip WoodSep 24, 2025
  117. Ezekiel NewrenSep 24, 2025
  118. 06/13 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  119. 07/13 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 23, 2025
  120. 08/13 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  121. 09/13 xdiff: delete chastore from xdfile_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  122. 10/13 xdiff: delete rchg aliasingEzekiel Newren via GitGitGadget, Sep 23, 2025
  123. Phillip WoodSep 24, 2025
  124. Ezekiel NewrenSep 24, 2025
  125. Junio C HamanoSep 24, 2025
  126. Ezekiel NewrenSep 24, 2025
  127. Junio C HamanoSep 24, 2025
  128. Ezekiel NewrenSep 24, 2025
  129. Junio C HamanoSep 25, 2025
  130. Ezekiel NewrenSep 25, 2025
  131. 11/13 xdiff: rename rchg -> changed in xdfile_tEzekiel Newren via GitGitGadget, Sep 23, 2025
  132. Phillip WoodSep 24, 2025
  133. Ezekiel NewrenSep 24, 2025
  134. Phillip WoodSep 24, 2025
  135. 12/13 xdiff: use enum macros NONE(0), SOME(1), TOO_MANY(2) in xprepare.cEzekiel Newren via GitGitGadget, Sep 23, 2025
  136. Phillip WoodSep 24, 2025
  137. Ezekiel NewrenSep 24, 2025
  138. Phillip WoodSep 24, 2025
  139. Junio C HamanoSep 24, 2025
  140. Ezekiel NewrenSep 25, 2025
  141. Ezekiel NewrenSep 26, 2025
  142. 13/13 xdiff: change type of xdfile_t.changed from char to boolEzekiel Newren via GitGitGadget, Sep 23, 2025
  143. Phillip WoodSep 24, 2025
  144. Ezekiel NewrenSep 24, 2025
  145. 00/12 Cleanup xdfile_t and xrecord_t in xdiff.Ezekiel Newren via GitGitGadget, Sep 26, 2025
  146. 01/12 xdiff: delete static forward declarations in xprepareEzekiel Newren via GitGitGadget, Sep 26, 2025
  147. 02/12 xdiff: delete local variables and initialize/free xdfile_t directlyEzekiel Newren via GitGitGadget, Sep 26, 2025
  148. 03/12 xdiff: delete unnecessary fields from xrecord_t and xdfile_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  149. 04/12 xdiff: delete superfluous function xdl_get_rec() in xemitEzekiel Newren via GitGitGadget, Sep 26, 2025
  150. 05/12 xdiff: delete local variables that alias fields in xrecord_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  151. 06/12 xdiff: delete struct diffdata_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  152. 07/12 xdiff: delete redundant array xdfile_t.haEzekiel Newren via GitGitGadget, Sep 26, 2025
  153. 08/12 xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  154. 09/12 xdiff: delete chastore from xdfile_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  155. 10/12 xdiff: rename rchg -> changed in xdfile_tEzekiel Newren via GitGitGadget, Sep 26, 2025
  156. 11/12 xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.cEzekiel Newren via GitGitGadget, Sep 26, 2025
  157. 12/12 xdiff: change type of xdfile_t.changed from char to boolEzekiel Newren via GitGitGadget, Sep 26, 2025
  158. Phillip WoodOct 3, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.