summaryrefslogtreecommitdiff
path: root/ext/dba/dba_flatfile.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
committerAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
commit4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch)
treec9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/dba/dba_flatfile.c
parent79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff)
parentdec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff)
downloadphp-git-POST_NATIVE_TLS_MERGE.tar.gz
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/dba/dba_flatfile.c')
-rw-r--r--ext/dba/dba_flatfile.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c
index 9be6e9be18..49f39cf2a8 100644
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@@ -67,7 +67,7 @@ DBA_FETCH_FUNC(flatfile)
FLATFILE_DATA;
FLATFILE_GKEY;
- gval = flatfile_fetch(dba, gkey TSRMLS_CC);
+ gval = flatfile_fetch(dba, gkey);
if (gval.dptr) {
if (newlen) {
*newlen = gval.dsize;
@@ -87,16 +87,16 @@ DBA_UPDATE_FUNC(flatfile)
gval.dptr = (char *) val;
gval.dsize = vallen;
- switch(flatfile_store(dba, gkey, gval, mode==1 ? FLATFILE_INSERT : FLATFILE_REPLACE TSRMLS_CC)) {
+ switch(flatfile_store(dba, gkey, gval, mode==1 ? FLATFILE_INSERT : FLATFILE_REPLACE)) {
case 0:
return SUCCESS;
case 1:
return FAILURE;
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:
- php_error_docref2(NULL TSRMLS_CC, key, val, E_WARNING, "Unknown return value");
+ php_error_docref2(NULL, key, val, E_WARNING, "Unknown return value");
return FAILURE;
}
}
@@ -107,7 +107,7 @@ DBA_EXISTS_FUNC(flatfile)
FLATFILE_DATA;
FLATFILE_GKEY;
- gval = flatfile_fetch(dba, gkey TSRMLS_CC);
+ gval = flatfile_fetch(dba, gkey);
if (gval.dptr) {
efree(gval.dptr);
return SUCCESS;
@@ -119,7 +119,7 @@ DBA_DELETE_FUNC(flatfile)
{
FLATFILE_DATA;
FLATFILE_GKEY;
- return(flatfile_delete(dba, gkey TSRMLS_CC) == -1 ? FAILURE : SUCCESS);
+ return(flatfile_delete(dba, gkey) == -1 ? FAILURE : SUCCESS);
}
DBA_FIRSTKEY_FUNC(flatfile)
@@ -129,7 +129,7 @@ DBA_FIRSTKEY_FUNC(flatfile)
if (dba->nextkey.dptr) {
efree(dba->nextkey.dptr);
}
- dba->nextkey = flatfile_firstkey(dba TSRMLS_CC);
+ dba->nextkey = flatfile_firstkey(dba);
if (dba->nextkey.dptr) {
if (newlen) {
*newlen = dba->nextkey.dsize;
@@ -150,7 +150,7 @@ DBA_NEXTKEY_FUNC(flatfile)
if (dba->nextkey.dptr) {
efree(dba->nextkey.dptr);
}
- dba->nextkey = flatfile_nextkey(dba TSRMLS_CC);
+ dba->nextkey = flatfile_nextkey(dba);
if (dba->nextkey.dptr) {
if (newlen) {
*newlen = dba->nextkey.dsize;