clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup TSRMLS_FETCH in ext/fileinfo

Browse Source
This commit is contained in:
Anatol Belski 2014-09-26 21:30:22 +02:00
parent 86ef4876cd
commit 26e5f9bab7
6 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/fileinfo/libmagic/apprentice.c
View File

@ -960,8 +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,8 +1149,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 */
@ -2607,9 +2603,6 @@ apprentice_map(struct magic_set *ms, const char *fn)
php_stream *stream = NULL;
php_stream_statbuf st;
TSRMLS_FETCH();
if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) {
file_oomem(ms, sizeof(*map));
efree(map);
@ -2761,8 +2754,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);
if (dbname == NULL)
@ -2820,7 +2811,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)

1
ext/fileinfo/libmagic/fsmagic.c
View File

@ -94,7 +94,6 @@ file_fsmagic(struct magic_set *ms, const char *fn, zend_stat_t *sb, php_stream *
{
int ret, did = 0;
int mime = ms->flags & MAGIC_MIME;
TSRMLS_FETCH();
if (ms->flags & MAGIC_APPLE)
return 0;

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

@ -221,7 +221,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const
/* Check if we have a CDF file */
if ((ms->flags & MAGIC_NO_CHECK_CDF) == 0) {
php_socket_t fd;
TSRMLS_FETCH();
if (stream && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&fd, 0)) {
if ((m = file_trycdf(ms, fd, ubuf, nb)) != 0) {
if ((ms->flags & MAGIC_DEBUG) != 0)
@ -445,7 +445,6 @@ file_replace(struct magic_set *ms, const char *pat, const char *rep)
zend_string *res;
zval repl;
int rep_cnt = 0;
TSRMLS_FETCH();
(void)setlocale(LC_CTYPE, "C");

1
ext/fileinfo/libmagic/magic.c
View File

@ -353,7 +353,6 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
zend_stat_t sb;
ssize_t nbytes = 0; /* number of bytes read from a datafile */
int no_in_stream = 0;
TSRMLS_FETCH();
if (!inname && !stream) {
return NULL;

1
ext/fileinfo/libmagic/print.c
View File

@ -60,7 +60,6 @@ file_magwarn(struct magic_set *ms, const char *f, ...)
{
va_list va;
char *expanded_format;
TSRMLS_FETCH();
va_start(va, f);
if (vasprintf(&expanded_format, f, va)); /* silence */

2
ext/fileinfo/libmagic/softmagic.c
View File

@ -360,7 +360,6 @@ check_fmt(struct magic_set *ms, struct magic *m)
int re_options, rv = -1;
pcre_extra *re_extra;
zend_string *pattern;
TSRMLS_FETCH();
if (strchr(m->desc, '%') == NULL)
return 0;
@ -2079,7 +2078,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
zval pattern;
int options = 0;
pcre_cache_entry *pce;
TSRMLS_FETCH();
options |= PCRE_MULTILINE;