php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync PHP_FILEINFO_UNCOMPRESS #if/ifdef/defined (#14525)

Browse Source 
This fixes few more -Wundef warnings in ext/fileinfo. The
PHP_FILEINFO_UNCOMPRESS seems to be present to be defined at some point
but is currently unused in all build systems. Leaving this intact for
now.

Follow up of GH-5526 (-Wundef)
This commit is contained in:
Peter Kokot
2024-06-10 08:11:25 +02:00
committed by GitHub
parent 89185745f1
commit d3901b8ca6
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ext/fileinfo/libmagic.patch
View File

@@ -1,6 +1,6 @@
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
--- libmagic.orig/apprentice.c 2023-07-17 16:38:35.000000000 +0200
+++ libmagic/apprentice.c 2024-05-27 16:08:06.689332368 +0200
+++ libmagic/apprentice.c 2024-06-09 00:31:40.345830732 +0200
@@ -48,7 +48,9 @@
#ifdef QUICK
#include <sys/mman.h>
@@ -870,7 +870,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
break;
diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
--- libmagic.orig/ascmagic.c 2023-05-30 22:17:50.000000000 +0200
+++ libmagic/ascmagic.c 2024-05-27 16:08:06.689332368 +0200
+++ libmagic/ascmagic.c 2024-06-09 00:31:40.345830732 +0200
@@ -96,7 +96,7 @@
rv = file_ascmagic_with_encoding(ms, &bb,
ubuf, ulen, code, type, text);
@@ -912,7 +912,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
}
diff -u libmagic.orig/buffer.c libmagic/buffer.c
--- libmagic.orig/buffer.c 2023-07-02 14:48:39.000000000 +0200
+++ libmagic/buffer.c 2024-05-27 16:08:06.689332368 +0200
+++ libmagic/buffer.c 2024-06-09 00:31:40.345830732 +0200
@@ -31,19 +31,21 @@
#endif /* lint */
@@ -971,7 +971,7 @@ diff -u libmagic.orig/buffer.c libmagic/buffer.c
}
diff -u libmagic.orig/cdf.c libmagic/cdf.c
--- libmagic.orig/cdf.c 2022-09-24 22:56:49.000000000 +0200
+++ libmagic/cdf.c 2024-05-27 16:08:06.689332368 +0200
+++ libmagic/cdf.c 2024-06-09 00:31:40.345830732 +0200
@@ -43,7 +43,9 @@
#include <err.h>
#endif
@@ -1202,7 +1202,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
#endif
diff -u libmagic.orig/cdf.h libmagic/cdf.h
--- libmagic.orig/cdf.h 2022-09-24 22:56:49.000000000 +0200
+++ libmagic/cdf.h 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/cdf.h 2024-06-04 15:10:40.600783222 +0200
@@ -37,8 +37,6 @@
#ifdef WIN32
@@ -1214,7 +1214,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
#define timespec timeval
diff -u libmagic.orig/compress.c libmagic/compress.c
--- libmagic.orig/compress.c 2023-05-21 17:59:58.000000000 +0200
+++ libmagic/compress.c 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/compress.c 2024-06-09 00:31:40.346830746 +0200
@@ -63,13 +63,14 @@
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
@@ -1333,7 +1333,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
+#endif
diff -u libmagic.orig/der.c libmagic/der.c
--- libmagic.orig/der.c 2022-09-24 22:56:49.000000000 +0200
+++ libmagic/der.c 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/der.c 2024-06-09 00:31:40.346830746 +0200
@@ -54,7 +54,9 @@
#include "magic.h"
#include "der.h"
@@ -1346,7 +1346,7 @@ diff -u libmagic.orig/der.c libmagic/der.c
#endif
diff -u libmagic.orig/encoding.c libmagic/encoding.c
--- libmagic.orig/encoding.c 2022-12-26 18:31:56.000000000 +0100
+++ libmagic/encoding.c 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/encoding.c 2024-06-09 00:31:40.346830746 +0200
@@ -97,7 +97,7 @@
nbytes = ms->encoding_max;
@@ -1382,7 +1382,7 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
}
diff -u libmagic.orig/file.h libmagic/file.h
--- libmagic.orig/file.h 2023-07-27 21:40:22.000000000 +0200
+++ libmagic/file.h 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/file.h 2024-06-09 00:31:40.346830746 +0200
@@ -27,15 +27,13 @@
*/
/*
@@ -1583,7 +1583,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
#define QUICK
diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
--- libmagic.orig/fsmagic.c 2023-07-27 21:33:24.000000000 +0200
+++ libmagic/fsmagic.c 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/fsmagic.c 2024-06-09 00:31:40.346830746 +0200
@@ -66,26 +66,10 @@
# define minor(dev) ((dev) & 0xff)
#endif
@@ -1876,7 +1876,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
case S_IFSOCK:
diff -u libmagic.orig/funcs.c libmagic/funcs.c
--- libmagic.orig/funcs.c 2023-07-27 21:40:12.000000000 +0200
+++ libmagic/funcs.c 2024-05-27 16:08:06.690332378 +0200
+++ libmagic/funcs.c 2024-06-09 17:55:33.549243946 +0200
@@ -66,7 +66,7 @@
file_private void
file_clearbuf(struct magic_set *ms)
@@ -1969,7 +1969,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
#endif
-#if HAVE_FORK
+
+#if PHP_FILEINFO_UNCOMPRESS
+#ifdef PHP_FILEINFO_UNCOMPRESS
/* try compression stuff */
if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) {
m = file_zmagic(ms, &b, inname);
@@ -1987,7 +1987,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
rv = -1;
}
-#if HAVE_FORK
+#if PHP_FILEINFO_UNCOMPRESS
+#ifdef PHP_FILEINFO_UNCOMPRESS
done_encoding:
#endif
- free(rbuf);
@@ -2222,7 +2222,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
file_clear_closexec(int fd) {
diff -u libmagic.orig/magic.c libmagic/magic.c
--- libmagic.orig/magic.c 2023-07-27 21:33:24.000000000 +0200
+++ libmagic/magic.c 2024-05-27 16:08:06.691332388 +0200
+++ libmagic/magic.c 2024-06-09 00:31:40.347830761 +0200
@@ -25,11 +25,6 @@
* SUCH DAMAGE.
*/
@@ -2695,8 +2695,8 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
}
return file_getbuffer(ms);
diff -u libmagic.orig/magic.h libmagic/magic.h
--- libmagic.orig/magic.h 2024-05-28 16:08:42.589182799 +0200
+++ libmagic/magic.h 2024-05-27 16:08:06.691332388 +0200
--- libmagic.orig/magic.h 2024-06-09 17:55:50.382419678 +0200
+++ libmagic/magic.h 2024-06-09 00:31:40.347830761 +0200
@@ -47,8 +47,6 @@
* extensions */
#define MAGIC_COMPRESS_TRANSP 0x2000000 /* Check inside compressed files
@@ -2749,7 +2749,7 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
int magic_getparam(magic_t, int, void *);
diff -u libmagic.orig/print.c libmagic/print.c
--- libmagic.orig/print.c 2023-07-27 20:04:45.000000000 +0200
+++ libmagic/print.c 2024-05-27 16:08:06.691332388 +0200
+++ libmagic/print.c 2024-06-09 00:31:40.347830761 +0200
@@ -73,7 +73,7 @@
if (m->mask_op & FILE_OPINVERSE)
(void) fputc('~', stderr);
@@ -2806,7 +2806,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
goto out;
diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
--- libmagic.orig/readcdf.c 2023-02-09 18:43:53.000000000 +0100
+++ libmagic/readcdf.c 2024-05-27 16:08:06.691332388 +0200
+++ libmagic/readcdf.c 2024-06-09 00:31:40.347830761 +0200
@@ -31,7 +31,9 @@
#include <assert.h>
@@ -2926,7 +2926,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
if (i != -1)
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
--- libmagic.orig/softmagic.c 2023-07-27 21:40:12.000000000 +0200
+++ libmagic/softmagic.c 2024-05-27 16:08:06.691332388 +0200
+++ libmagic/softmagic.c 2024-06-09 00:31:40.347830761 +0200
@@ -45,7 +45,7 @@
#include <time.h>
#include "der.h"

4
ext/fileinfo/libmagic/funcs.c
View File

@@ -371,7 +371,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, zend_stat_t *st,
}
#endif
#if PHP_FILEINFO_UNCOMPRESS
#ifdef PHP_FILEINFO_UNCOMPRESS
/* try compression stuff */
if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) {
m = file_zmagic(ms, &b, inname);
@@ -507,7 +507,7 @@ simple:
if (file_printf(ms, "%s", code_mime) == -1)
rv = -1;
}
#if PHP_FILEINFO_UNCOMPRESS
#ifdef PHP_FILEINFO_UNCOMPRESS
done_encoding:
#endif
efree(rbuf);