diff options
Diffstat (limited to 'ext/dba/dba.c')
| -rw-r--r-- | ext/dba/dba.c | 83 |
1 files changed, 3 insertions, 80 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 952993582b..a24b70ecd3 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -50,82 +48,7 @@ #include "php_qdbm.h" #include "php_tcadb.h" #include "php_lmdb.h" - -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) - ZEND_ARG_INFO(0, path) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, handlername) - ZEND_ARG_VARIADIC_INFO(0, handler_parameters) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2) - ZEND_ARG_INFO(0, path) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, handlername) - ZEND_ARG_VARIADIC_INFO(0, handler_parameters) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_close, 0) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_exists, 0) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_fetch, 0, 0, 2) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, skip) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_key_split, 0) - ZEND_ARG_INFO(0, key) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_firstkey, 0) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_nextkey, 0) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_delete, 0) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_insert, 0) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, value) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_replace, 0) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, value) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_optimize, 0) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_sync, 0) - ZEND_ARG_INFO(0, handle) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_handlers, 0, 0, 0) - ZEND_ARG_INFO(0, full_info) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_dba_list, 0) -ZEND_END_ARG_INFO() - -/* }}} */ +#include "dba_arginfo.h" /* {{{ dba_functions[] */ @@ -277,13 +200,13 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free) #define DBA_FETCH_RESOURCE(info, id) \ if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \ - RETURN_FALSE; \ + return; \ } #define DBA_FETCH_RESOURCE_WITH_ID(info, id) \ if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \ DBA_ID_DONE; \ - RETURN_FALSE; \ + return; \ } #define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_FETCH_RESOURCE_WITH_ID(info, id) |