@@ -89,8 +89,6 @@ ZEND_TSRMLS_CACHE_DEFINE()
89
89
ZEND_GET_MODULE (dba )
90
90
#endif
91
91
92
- /* these are used to get the standard arguments */
93
-
94
92
/* {{{ php_dba_myke_key */
95
93
static size_t php_dba_make_key (zval * key , char * * key_str , char * * key_free )
96
94
{
@@ -134,17 +132,6 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
134
132
}
135
133
/* }}} */
136
134
137
- #define DBA_GET2 \
138
- zval *key; \
139
- char *key_str, *key_free; \
140
- size_t key_len; \
141
- if (zend_parse_parameters(ac, "zr", &key, &id) == FAILURE) { \
142
- RETURN_THROWS(); \
143
- } \
144
- if ((key_len = php_dba_make_key(key, &key_str, &key_free)) == 0) {\
145
- RETURN_FALSE; \
146
- }
147
-
148
135
#define DBA_FETCH_RESOURCE (info , id ) \
149
136
if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \
150
137
RETURN_THROWS(); \
@@ -910,7 +897,16 @@ PHP_FUNCTION(dba_exists)
910
897
zval * id ;
911
898
dba_info * info = NULL ;
912
899
int ac = ZEND_NUM_ARGS ();
913
- DBA_GET2 ;
900
+ zval * key ;
901
+ char * key_str , * key_free ;
902
+ size_t key_len ;
903
+
904
+ if (zend_parse_parameters (ac , "zr" , & key , & id ) == FAILURE ) {
905
+ RETURN_THROWS ();
906
+ }
907
+ if ((key_len = php_dba_make_key (key , & key_str , & key_free )) == 0 ) {
908
+ RETURN_FALSE ;
909
+ }
914
910
DBA_FETCH_RESOURCE_WITH_ID (info , id );
915
911
916
912
if (info -> hnd -> exists (info , key_str , key_len ) == SUCCESS ) {
@@ -1078,7 +1074,16 @@ PHP_FUNCTION(dba_delete)
1078
1074
zval * id ;
1079
1075
dba_info * info = NULL ;
1080
1076
int ac = ZEND_NUM_ARGS ();
1081
- DBA_GET2 ;
1077
+ zval * key ;
1078
+ char * key_str , * key_free ;
1079
+ size_t key_len ;
1080
+
1081
+ if (zend_parse_parameters (ac , "zr" , & key , & id ) == FAILURE ) {
1082
+ RETURN_THROWS ();
1083
+ }
1084
+ if ((key_len = php_dba_make_key (key , & key_str , & key_free )) == 0 ) {
1085
+ RETURN_FALSE ;
1086
+ }
1082
1087
DBA_FETCH_RESOURCE_WITH_ID (info , id );
1083
1088
1084
1089
DBA_WRITE_CHECK_WITH_ID ;
0 commit comments