Skip to content

xdl_regex_buf should be static inline #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2025
Merged

xdl_regex_buf should be static inline #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a4ceb3
Update xdiff to git v2.48.1's version
ethomson Jan 19, 2025
ac13dba
xdl_regex_buf should be `static inline`
ethomson Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions git-2.45.0.patch → git-2.48.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff --git a/git-xdiff.h b/git-xdiff.h
new file mode 100644
index 0000000..4091d22
index 0000000..e3a6ef8
--- /dev/null
+++ b/git-xdiff.h
@@ -0,0 +1,79 @@
Expand Down Expand Up @@ -57,7 +57,7 @@ index 0000000..4091d22
+# define xdl_regex_t void *
+# define xdl_regmatch_t void *
+
+inline int xdl_regexec_buf(
+static inline int xdl_regexec_buf(
+ const xdl_regex_t *preg, const char *buf, size_t size,
+ size_t nmatch, xdl_regmatch_t pmatch[], int eflags)
+{
Expand All @@ -70,7 +70,7 @@ index 0000000..4091d22
+# define xdl_regex_t regex_t
+# define xdl_regmatch_t regmatch_t
+
+inline int xdl_regexec_buf(
+static inline int xdl_regexec_buf(
+ const xdl_regex_t *preg, const char *buf, size_t size,
+ size_t nmatch, xdl_regmatch_t pmatch[], int eflags)
+{
Expand Down Expand Up @@ -118,10 +118,10 @@ index bb56b23..fb47f63 100644
long xdl_mmfile_size(mmfile_t *mmf);

diff --git a/xdiffi.c b/xdiffi.c
index 344c2df..ea36143 100644
index 4685ba6..7224739 100644
--- a/xdiffi.c
+++ b/xdiffi.c
@@ -833,7 +833,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
@@ -834,7 +834,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
/* Shift the group backward as much as possible: */
while (!group_slide_up(xdf, &g))
if (group_previous(xdfo, &go))
Expand All @@ -130,7 +130,7 @@ index 344c2df..ea36143 100644

/*
* This is this highest that this group can be shifted.
@@ -849,7 +849,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
@@ -850,7 +850,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
if (group_slide_down(xdf, &g))
break;
if (group_next(xdfo, &go))
Expand All @@ -139,7 +139,7 @@ index 344c2df..ea36143 100644

if (go.end > go.start)
end_matching_other = g.end;
@@ -874,9 +874,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
@@ -875,9 +875,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
*/
while (go.end == go.start) {
if (group_slide_up(xdf, &g))
Expand All @@ -151,7 +151,7 @@ index 344c2df..ea36143 100644
}
} else if (flags & XDF_INDENT_HEURISTIC) {
/*
@@ -917,9 +917,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
@@ -918,9 +918,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {

while (g.end > best_shift) {
if (group_slide_up(xdf, &g))
Expand All @@ -163,7 +163,7 @@ index 344c2df..ea36143 100644
}
}

@@ -928,11 +928,11 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
@@ -929,11 +929,11 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
if (group_next(xdf, &g))
break;
if (group_next(xdfo, &go))
Expand All @@ -177,7 +177,7 @@ index 344c2df..ea36143 100644

return 0;
}
@@ -973,7 +973,7 @@ void xdl_free_script(xdchange_t *xscr) {
@@ -974,7 +974,7 @@ void xdl_free_script(xdchange_t *xscr) {
}
}

Expand All @@ -186,7 +186,7 @@ index 344c2df..ea36143 100644
xdemitconf_t const *xecfg)
{
xdchange_t *xch, *xche;
@@ -1012,11 +1012,11 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
@@ -1013,11 +1013,11 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
}

static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) {
Expand All @@ -201,15 +201,18 @@ index 344c2df..ea36143 100644
return 1;

diff --git a/xinclude.h b/xinclude.h
index a4285ac..75db1d8 100644
index 7e56542..5163346 100644
--- a/xinclude.h
+++ b/xinclude.h
@@ -23,7 +23,7 @@
@@ -23,9 +23,10 @@
#if !defined(XINCLUDE_H)
#define XINCLUDE_H

-#include "git-compat-util.h"
+#include "git-xdiff.h"
+
#define DISABLE_SIGN_COMPARE_WARNINGS

-#include "git-compat-util.h"
#include "xmacros.h"
#include "xdiff.h"
#include "xtypes.h"
Expand Down
4 changes: 2 additions & 2 deletions git-xdiff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# define xdl_regex_t void *
# define xdl_regmatch_t void *

inline int xdl_regexec_buf(
static inline int xdl_regexec_buf(
const xdl_regex_t *preg, const char *buf, size_t size,
size_t nmatch, xdl_regmatch_t pmatch[], int eflags)
{
Expand All @@ -64,7 +64,7 @@ inline int xdl_regexec_buf(
# define xdl_regex_t regex_t
# define xdl_regmatch_t regmatch_t

inline int xdl_regexec_buf(
static inline int xdl_regexec_buf(
const xdl_regex_t *preg, const char *buf, size_t size,
size_t nmatch, xdl_regmatch_t pmatch[], int eflags)
{
Expand Down
1 change: 1 addition & 0 deletions xdiffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Davide Libenzi <davidel@xmailserver.org>
*
*/
#define DISABLE_SIGN_COMPARE_WARNINGS

#include "xinclude.h"

Expand Down
3 changes: 3 additions & 0 deletions xinclude.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#define XINCLUDE_H

#include "git-xdiff.h"

#define DISABLE_SIGN_COMPARE_WARNINGS

#include "xmacros.h"
#include "xdiff.h"
#include "xtypes.h"
Expand Down
Loading