Skip to content

Fix misplaced endif in apprentice_sort() #18686

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 1 commit into from
May 29, 2025
Merged

Fix misplaced endif in apprentice_sort() #18686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ext/fileinfo/libmagic.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ext/fileinfo/libmagic/apprentice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down