summaryrefslogtreecommitdiff
path: root/ext/dba/dba_inifile.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-13 23:06:14 +0100
committerAnatol Belski <ab@php.net>2014-12-13 23:06:14 +0100
commitbdeb220f48825642f84cdbf3ff23a30613c92e86 (patch)
tree1a6cf34d20420e4815b4becb21311a4457d84103 /ext/dba/dba_inifile.c
parentbb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff)
downloadphp-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/dba/dba_inifile.c')
-rw-r--r--ext/dba/dba_inifile.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c
index aaae690344..333438163c 100644
--- a/ext/dba/dba_inifile.c
+++ b/ext/dba/dba_inifile.c
@@ -42,7 +42,7 @@
#define INIFILE_GKEY \
key_type ini_key; \
if (!key) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "No key specified"); \
+ php_error_docref(NULL, E_WARNING, "No key specified"); \
return 0; \
} \
ini_key = inifile_key_split((char*)key) /* keylen not needed here */
@@ -52,7 +52,7 @@
DBA_OPEN_FUNC(inifile)
{
- info->dbf = inifile_alloc(info->fp, info->mode == DBA_READER, info->flags&DBA_PERSISTENT TSRMLS_CC);
+ info->dbf = inifile_alloc(info->fp, info->mode == DBA_READER, info->flags&DBA_PERSISTENT);
return info->dbf ? SUCCESS : FAILURE;
}
@@ -71,7 +71,7 @@ DBA_FETCH_FUNC(inifile)
INIFILE_DATA;
INIFILE_GKEY;
- ini_val = inifile_fetch(dba, &ini_key, skip TSRMLS_CC);
+ ini_val = inifile_fetch(dba, &ini_key, skip);
*newlen = ini_val.value ? strlen(ini_val.value) : 0;
INIFILE_DONE;
return ini_val.value;
@@ -88,14 +88,14 @@ DBA_UPDATE_FUNC(inifile)
ini_val.value = val;
if (mode == 1) {
- res = inifile_append(dba, &ini_key, &ini_val TSRMLS_CC);
+ res = inifile_append(dba, &ini_key, &ini_val);
} else {
- res = inifile_replace(dba, &ini_key, &ini_val TSRMLS_CC);
+ res = inifile_replace(dba, &ini_key, &ini_val);
}
INIFILE_DONE;
switch(res) {
case -1:
- php_error_docref1(NULL TSRMLS_CC, key, E_WARNING, "Operation not possible");
+ php_error_docref1(NULL, key, E_WARNING, "Operation not possible");
return FAILURE;
default:
case 0:
@@ -112,7 +112,7 @@ DBA_EXISTS_FUNC(inifile)
INIFILE_DATA;
INIFILE_GKEY;
- ini_val = inifile_fetch(dba, &ini_key, 0 TSRMLS_CC);
+ ini_val = inifile_fetch(dba, &ini_key, 0);
INIFILE_DONE;
if (ini_val.value) {
inifile_val_free(&ini_val);
@@ -129,7 +129,7 @@ DBA_DELETE_FUNC(inifile)
INIFILE_DATA;
INIFILE_GKEY;
- res = inifile_delete_ex(dba, &ini_key, &found TSRMLS_CC);
+ res = inifile_delete_ex(dba, &ini_key, &found);
INIFILE_DONE;
return (res == -1 || !found ? FAILURE : SUCCESS);
@@ -139,7 +139,7 @@ DBA_FIRSTKEY_FUNC(inifile)
{
INIFILE_DATA;
- if (inifile_firstkey(dba TSRMLS_CC)) {
+ if (inifile_firstkey(dba)) {
char *result = inifile_key_string(&dba->curr.key);
*newlen = strlen(result);
return result;
@@ -156,7 +156,7 @@ DBA_NEXTKEY_FUNC(inifile)
return NULL;
}
- if (inifile_nextkey(dba TSRMLS_CC)) {
+ if (inifile_nextkey(dba)) {
char *result = inifile_key_string(&dba->curr.key);
*newlen = strlen(result);
return result;