From 1ce1e91665ef172b7f9ee8d8213186372dc3d1f1 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Wed, 28 May 2025 18:58:07 +0200 Subject: [PATCH] Fix misplaced endif in apprentice_sort() We shouldn't warn for BC, but still should return the right value. --- ext/fileinfo/libmagic.patch | 2 +- ext/fileinfo/libmagic/apprentice.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 6cdfb1e5cb3ca..4eb7ccd336f89 100644 --- 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 index bc675c46e6ddf..31d01a2bd8d63 100644 --- 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; }