diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/fileinfo/libmagic/apprentice.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/fileinfo/libmagic/apprentice.c')
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index c1dc5aa1fa..83eb1f44f7 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -960,7 +960,6 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs, php_stream *stream; - TSRMLS_FETCH(); ms->file = fn; stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL); @@ -1151,7 +1150,6 @@ apprentice_load(struct magic_set *ms, const char *fn, int action) php_stream *dir; php_stream_dirent d; - TSRMLS_FETCH(); memset(mset, 0, sizeof(mset)); ms->flags |= MAGIC_CHECK; /* Enable checks for parsed files */ @@ -2608,7 +2606,6 @@ apprentice_map(struct magic_set *ms, const char *fn) php_stream_statbuf st; - TSRMLS_FETCH(); if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) { file_oomem(ms, sizeof(*map)); @@ -2761,7 +2758,6 @@ apprentice_compile(struct magic_set *ms, struct magic_map *map, const char *fn) uint32_t i; php_stream *stream; - TSRMLS_FETCH(); dbname = mkdbname(ms, fn, 0); @@ -2820,7 +2816,6 @@ mkdbname(struct magic_set *ms, const char *fn, int strip) { const char *p, *q; char *buf; - TSRMLS_FETCH(); if (strip) { if ((p = strrchr(fn, '/')) != NULL) |