From 10c8daf16582889c64a09a858bf5fc233e4dfb2b Mon Sep 17 00:00:00 2001 From: krakjoe Date: Fri, 26 Sep 2014 11:11:33 +0100 Subject: remove fetch from dba --- ext/dba/dba_db4.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ext/dba/dba_db4.c') diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index a9752a7bf6..eeea2db3a5 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -42,8 +42,6 @@ static void php_dba_db4_errcall_fcn( #endif const char *errpfx, const char *msg) { - TSRMLS_FETCH(); - #if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) /* Bug 51086, Berkeley DB 4.8.26 */ /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */ -- cgit v1.2.1 From c00424e427930a33e6d8645cc3f23fb78ed29b9f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 09:37:55 +0200 Subject: bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream --- ext/dba/dba_db4.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/dba/dba_db4.c') diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index eeea2db3a5..a9752a7bf6 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -42,6 +42,8 @@ static void php_dba_db4_errcall_fcn( #endif const char *errpfx, const char *msg) { + TSRMLS_FETCH(); + #if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) /* Bug 51086, Berkeley DB 4.8.26 */ /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */ -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/dba/dba_db4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ext/dba/dba_db4.c') diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index a9752a7bf6..393c565b2a 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -42,13 +42,12 @@ static void php_dba_db4_errcall_fcn( #endif const char *errpfx, const char *msg) { - TSRMLS_FETCH(); #if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) /* Bug 51086, Berkeley DB 4.8.26 */ /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */ { - const char *function = get_active_function_name(TSRMLS_C); + const char *function = get_active_function_name(); if (function && (!strcmp(function,"dba_popen") || !strcmp(function,"dba_open")) && (!strncmp(msg, "fop_read_meta", sizeof("fop_read_meta")-1) || !strncmp(msg, "BDB0004 fop_read_meta", sizeof("BDB0004 fop_read_meta")-1))) { @@ -57,7 +56,7 @@ static void php_dba_db4_errcall_fcn( } #endif - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s%s", errpfx?errpfx:"", msg); + php_error_docref(NULL, E_NOTICE, "%s%s", errpfx?errpfx:"", msg); } #define DB4_DATA dba_db4_data *dba = info->dbf @@ -239,7 +238,7 @@ DBA_FIRSTKEY_FUNC(db4) } /* we should introduce something like PARAM_PASSTHRU... */ - return dba_nextkey_db4(info, newlen TSRMLS_CC); + return dba_nextkey_db4(info, newlen); } DBA_NEXTKEY_FUNC(db4) -- cgit v1.2.1