archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix misplaced endif in apprentice_sort() (#18686)

Browse source
This commit is contained in:
Niels Dossche 2025-05-29 12:04:07 +02:00 • committed by GitHub
parent 8b4edf0229
commit 399cb4ca85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/fileinfo/libmagic.patch
View file

@ -328,8 +328,8 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
@@ -1151,6 +1075,7 @@ @@ -1151,6 +1075,7 @@
file_mdump(ma->mp); file_mdump(ma->mp);
file_mdump(mb->mp); file_mdump(mb->mp);
return 0;
+#endif +#endif
return 0;
} }
return x > 0 ? -1 : 1; return x > 0 ? -1 : 1;
} }

2
ext/fileinfo/libmagic/apprentice.c
View file

@ -1074,8 +1074,8 @@ apprentice_sort(const void *a, const void *b)
ma->mp->desc); ma->mp->desc);
file_mdump(ma->mp); file_mdump(ma->mp);
file_mdump(mb->mp); file_mdump(mb->mp);
return 0;
#endif #endif
return 0;
} }
return x > 0 ? -1 : 1; return x > 0 ? -1 : 1;
} }