Merge pull request libgit2#5317 from csware/size_t

ethomson · web-flow · commit ad1548e4ea29 · 2019-12-04T13:51:03.000+11:00
MSVC: Fix warning C4133 on x64: "function": Incompatible types - from "unsigned long *" to "size_t *"
diff --git a/src/regexp.c b/src/regexp.c
@@ -78,7 +78,7 @@ int git_regexp_search(const git_regexp *r, const char *string, size_t nmatches,
 int git_regexp_compile(git_regexp *r, const char *pattern, int flags)
 {
 	unsigned char errmsg[1024];
-	unsigned long erroff;
+	PCRE2_SIZE erroff;
 	int error, cflags = 0;
 
 	if (flags & GIT_REGEXP_ICASE)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ int git_regexp_search(const git_regexp r, const char string, size_t nmatches,`
`78`	`78`	`int git_regexp_compile(git_regexp r, const char pattern, int flags)`
`79`	`79`	`{`
`80`	`80`	`unsigned char errmsg[1024];`
`81`		`- unsigned long erroff;`
	`81`	`+ PCRE2_SIZE erroff;`
`82`	`82`	`int error, cflags = 0;`
`83`	`83`
`84`	`84`	`if (flags & GIT_REGEXP_ICASE)`