diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-02-03 12:07:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-02-03 12:07:36 +0800 |
| commit | 5c87488a70acafa9122fba58774e2ea6bc6f1f26 (patch) | |
| tree | a07eae69a30ed76fc1ab520119af3a03f27ccc21 | |
| parent | efc75061eda276b6f171d1fa483287461480b70e (diff) | |
| download | php-git-5c87488a70acafa9122fba58774e2ea6bc6f1f26.tar.gz | |
Ported dba
| -rw-r--r-- | ext/dba/dba.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 739652afff..f4569071f1 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -277,7 +277,9 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free) #define DBA_FETCH_RESOURCE(info, id) \ - ZEND_FETCH_RESOURCE2(info, dba_info *, id, -1, "DBA identifier", le_db, le_pdb); + if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \ + RETURN_FALSE; \ + } #define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_FETCH_RESOURCE(info, id) #define DBA_ID_GET2_3 DBA_ID_PARS; DBA_GET2_3; DBA_FETCH_RESOURCE(info, id) @@ -951,7 +953,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } } - ZEND_REGISTER_RESOURCE(return_value, info, (persistent ? le_pdb : le_db)); + RETVAL_RES(zend_register_resource(info, (persistent ? le_pdb : le_db))); FREENOW; } /* }}} */ |