Fix misplaced endif in apprentice_sort() (php#18686)

ndossche · web-flow · commit 399cb4ca85f4 · 2025-05-29T12:04:07.000+02:00
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
@@ -328,8 +328,8 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 @@ -1151,6 +1075,7 @@
  			file_mdump(ma->mp);
  			file_mdump(mb->mp);
- 			return 0;
 +#endif
+ 			return 0;
  		}
  		return x > 0 ? -1 : 1;
  	}
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
@@ -1074,8 +1074,8 @@ apprentice_sort(const void *a, const void *b)
 			    ma->mp->desc);
 			file_mdump(ma->mp);
 			file_mdump(mb->mp);
-			return 0;
 #endif
+			return 0;
 		}
 		return x > 0 ? -1 : 1;
 	}

Original file line number	Diff line number	Diff line change
`@@ -328,8 +328,8 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c`
`328`	`328`	`@@ -1151,6 +1075,7 @@`
`329`	`329`	`file_mdump(ma->mp);`
`330`	`330`	`file_mdump(mb->mp);`
`331`		`- return 0;`
`332`	`331`	`+#endif`
	`332`	`+ return 0;`
`333`	`333`	`}`
`334`	`334`	`return x > 0 ? -1 : 1;`
`335`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1074,8 +1074,8 @@ apprentice_sort(const void a, const void b)`
`1074`	`1074`	`ma->mp->desc);`
`1075`	`1075`	`file_mdump(ma->mp);`
`1076`	`1076`	`file_mdump(mb->mp);`
`1077`		`- return 0;`
`1078`	`1077`	`#endif`
	`1078`	`+ return 0;`
`1079`	`1079`	`}`
`1080`	`1080`	`return x > 0 ? -1 : 1;`
`1081`	`1081`	`}`