Skip to content

Commit e64c386

Browse files
committed
libmagic: Update patch
[ci skip] Signed-off-by: Anatol Belski <ab@php.net>
1 parent 73dcfb6 commit e64c386

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/fileinfo/libmagic.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ diff -ur libmagic.orig/encoding.c libmagic/encoding.c
17021702
return 0;
17031703
diff -ur libmagic.orig/file.h libmagic/file.h
17041704
--- libmagic.orig/file.h 2020-06-15 02:01:01.000000000 +0200
1705-
+++ libmagic/file.h 2020-08-29 11:56:12.303522747 +0200
1705+
+++ libmagic/file.h 2020-09-02 17:35:51.709611515 +0200
17061706
@@ -33,17 +33,13 @@
17071707
#ifndef __file_h__
17081708
#define __file_h__
@@ -1900,7 +1900,7 @@ diff -ur libmagic.orig/file.h libmagic/file.h
19001900
- int);
19011901
-protected void file_regfree(file_regex_t *);
19021902
-protected void file_regerror(file_regex_t *, int, struct magic_set *);
1903-
+public zend_string* convert_libmagic_pattern(char *val, size_t len, uint32_t options);
1903+
+public zend_string* convert_libmagic_pattern(const char *val, size_t len, uint32_t options);
19041904

19051905
typedef struct {
19061906
char *buf;
@@ -3333,7 +3333,7 @@ diff -ur libmagic.orig/readcdf.c libmagic/readcdf.c
33333333
if (i != -1)
33343334
diff -ur libmagic.orig/softmagic.c libmagic/softmagic.c
33353335
--- libmagic.orig/softmagic.c 2020-06-15 02:01:01.000000000 +0200
3336-
+++ libmagic/softmagic.c 2020-08-29 11:56:13.219516523 +0200
3336+
+++ libmagic/softmagic.c 2020-09-02 20:04:00.794667114 +0200
33373337
@@ -43,6 +43,10 @@
33383338
#include <time.h>
33393339
#include "der.h"
@@ -3495,7 +3495,7 @@ diff -ur libmagic.orig/softmagic.c libmagic/softmagic.c
34953495
return file_strncmp(a, b, len, maxlen, flags);
34963496
}
34973497

3498-
+public zend_string* convert_libmagic_pattern(char *val, size_t len, uint32_t options)
3498+
+public zend_string* convert_libmagic_pattern(const char *val, size_t len, uint32_t options)
34993499
+{
35003500
+ int i, j;
35013501
+ zend_string *t;

0 commit comments

Comments
 (0)