cvs: php-src(PHP_5_3) /ext/dba dba.c
| From: | Alexey Zakhlestin | Date: | Fri, 07 Nov 2008 12:39:11 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/dba dba.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54015@lists.php.net to get a copy of this message | ||
indeyets Fri Nov 7 12:39:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/dba dba.c
Log:
new parameter-parsing API
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5.2.6&r2=1.111.2.4.2.5.2.7&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5.2.6 php-src/ext/dba/dba.c:1.111.2.4.2.5.2.7 --- php-src/ext/dba/dba.c:1.111.2.4.2.5.2.6 Sun Nov 2 21:19:31 2008 +++ php-src/ext/dba/dba.c Fri Nov 7 12:39:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.111.2.4.2.5.2.6 2008/11/02 21:19:31 felipe Exp $ */ +/* $Id: dba.c,v 1.111.2.4.2.5.2.7 2008/11/07 12:39:11 indeyets Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -207,33 +207,28 @@ /* {{{ macromania */ #define DBA_ID_PARS \ - zval **id; \ + zval *id; \ dba_info *info = NULL; \ int ac = ZEND_NUM_ARGS() /* these are used to get the standard arguments */ -#define DBA_GET1 \ - if(ac != 1 || zend_get_parameters_ex(ac, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ - } - /* {{{ php_dba_myke_key */ -static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRMLS_DC) +static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS_DC) { - if (Z_TYPE_PP(key) == IS_ARRAY) { + if (Z_TYPE_P(key) == IS_ARRAY) { zval **group, **name; HashPosition pos; size_t len; - if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) { + if (zend_hash_num_elements(Z_ARRVAL_P(key)) != 2) { php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Key does not have exactly two elements: (key, name)"); return -1; } - zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &group, &pos); - zend_hash_move_forward_ex(Z_ARRVAL_PP(key), &pos); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &name, &pos); + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(key), &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &group, &pos); + zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &name, &pos); convert_to_string_ex(group); convert_to_string_ex(name); if (Z_STRLEN_PP(group) == 0) { @@ -245,43 +240,42 @@ *key_free = *key_str; return len; } else { - convert_to_string_ex(key); - *key_str = Z_STRVAL_PP(key); *key_free = NULL; - return Z_STRLEN_PP(key); + + convert_to_string(key); + *key_str = Z_STRVAL_P(key); + + return Z_STRLEN_P(key); } } /* }}} */ #define DBA_GET2 \ - zval **key; \ + zval *key; \ char *key_str, *key_free; \ size_t key_len; \ - if(ac != 2 || zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \ + return; \ } \ if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\ RETURN_FALSE; \ } #define DBA_GET2_3 \ - zval **key; \ + zval *key; \ char *key_str, *key_free; \ size_t key_len; \ - zval **tmp; \ int skip = 0; \ switch(ac) { \ case 2: \ - if (zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \ + return; \ } \ break; \ case 3: \ - if (zend_get_parameters_ex(ac, &key, &tmp, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zlr", &key, &skip, &id) == FAILURE) { \ + return; \ } \ - convert_to_long_ex(tmp); \ - skip = Z_LVAL_PP(tmp); \ break; \ default: \ WRONG_PARAM_COUNT; \ @@ -290,25 +284,12 @@ RETURN_FALSE; \ } -#define DBA_GET3 \ - zval **key, **val; \ - char *key_str, *key_free; \ - size_t key_len; \ - if(ac != 3 || zend_get_parameters_ex(ac, &key, &val, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ - } \ - convert_to_string_ex(val); \ - if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\ - RETURN_FALSE; \ - } -#define DBA_ID_GET \ +#define DBA_FETCH_RESOURCE(info, id) \ ZEND_FETCH_RESOURCE2(info, dba_info *, id, -1, "DBA identifier", le_db, le_pdb); - -#define DBA_ID_GET1 DBA_ID_PARS; DBA_GET1; DBA_ID_GET -#define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_ID_GET -#define DBA_ID_GET2_3 DBA_ID_PARS; DBA_GET2_3; DBA_ID_GET -#define DBA_ID_GET3 DBA_ID_PARS; DBA_GET3; DBA_ID_GET + +#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) #define DBA_ID_DONE \ if (key_free) efree(key_free) @@ -566,28 +547,43 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) { char *v; - int len; - DBA_ID_GET3; + int val_len; + zval *id; + dba_info *info = NULL; + int ac = ZEND_NUM_ARGS(); + zval *key; + char *val; + char *key_str, *key_free; + size_t key_len; + + if (zend_parse_parameters(ac TSRMLS_CC, "zsr", &key, &val, &val_len, &id) == FAILURE) { + return; + } + + if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) { + RETURN_FALSE; + } + + DBA_FETCH_RESOURCE(info, &id); DBA_WRITE_CHECK; - + if (PG(magic_quotes_runtime)) { - len = Z_STRLEN_PP(val); - v = estrndup(Z_STRVAL_PP(val), len); - php_stripslashes(v, &len TSRMLS_CC); - if(info->hnd->update(info, key_str, key_len, v, len, mode TSRMLS_CC) == SUCCESS) { + v = estrndup(val, val_len); + php_stripslashes(v, &val_len TSRMLS_CC); + if (info->hnd->update(info, key_str, key_len, v, val_len, mode TSRMLS_CC) == SUCCESS) { efree(v); DBA_ID_DONE; RETURN_TRUE; } efree(v); } else { - if(info->hnd->update(info, key_str, key_len, VALLEN(val), mode TSRMLS_CC) == SUCCESS) - { + if (info->hnd->update(info, key_str, key_len, val, val_len, mode TSRMLS_CC) == SUCCESS) { DBA_ID_DONE; RETURN_TRUE; } } + DBA_ID_DONE; RETURN_FALSE; } @@ -980,9 +976,16 @@ Closes database */ PHP_FUNCTION(dba_close) { - DBA_ID_GET1; - - zend_list_delete(Z_RESVAL_PP(id)); + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + + zend_list_delete(Z_RESVAL_P(id)); } /* }}} */ @@ -1081,11 +1084,20 @@ { char *fkey; int len; - DBA_ID_GET1; + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); fkey = info->hnd->firstkey(info, &len TSRMLS_CC); - if(fkey) + + if (fkey) RETURN_STRINGL(fkey, len, 0); + RETURN_FALSE; } /* }}} */ @@ -1096,11 +1108,20 @@ { char *nkey; int len; - DBA_ID_GET1; + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); nkey = info->hnd->nextkey(info, &len TSRMLS_CC); - if(nkey) + + if (nkey) RETURN_STRINGL(nkey, len, 0); + RETURN_FALSE; } /* }}} */ @@ -1146,12 +1167,21 @@ Optimizes (e.g. clean up, vacuum) database */ PHP_FUNCTION(dba_optimize) { - DBA_ID_GET1; - + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + DBA_WRITE_CHECK; - if(info->hnd->optimize(info TSRMLS_CC) == SUCCESS) { + + if (info->hnd->optimize(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } + RETURN_FALSE; } /* }}} */ @@ -1160,11 +1190,19 @@ Synchronizes database */ PHP_FUNCTION(dba_sync) { - DBA_ID_GET1; - - if(info->hnd->sync(info TSRMLS_CC) == SUCCESS) { + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + + if (info->hnd->sync(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } + RETURN_FALSE; } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5.2.6&r2=1.111.2.4.2.5.2.7&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5.2.6 php-src/ext/dba/dba.c:1.111.2.4.2.5.2.7 --- php-src/ext/dba/dba.c:1.111.2.4.2.5.2.6 Sun Nov 2 21:19:31 2008 +++ php-src/ext/dba/dba.c Fri Nov 7 12:39:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.111.2.4.2.5.2.6 2008/11/02 21:19:31 felipe Exp $ */ +/* $Id: dba.c,v 1.111.2.4.2.5.2.7 2008/11/07 12:39:11 indeyets Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -207,33 +207,28 @@ /* {{{ macromania */ #define DBA_ID_PARS \ - zval **id; \ + zval *id; \ dba_info *info = NULL; \ int ac = ZEND_NUM_ARGS() /* these are used to get the standard arguments */ -#define DBA_GET1 \ - if(ac != 1 || zend_get_parameters_ex(ac, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ - } - /* {{{ php_dba_myke_key */ -static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRMLS_DC) +static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS_DC) { - if (Z_TYPE_PP(key) == IS_ARRAY) { + if (Z_TYPE_P(key) == IS_ARRAY) { zval **group, **name; HashPosition pos; size_t len; - if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) { + if (zend_hash_num_elements(Z_ARRVAL_P(key)) != 2) { php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Key does not have exactly two elements: (key, name)"); return -1; } - zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &group, &pos); - zend_hash_move_forward_ex(Z_ARRVAL_PP(key), &pos); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &name, &pos); + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(key), &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &group, &pos); + zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &name, &pos); convert_to_string_ex(group); convert_to_string_ex(name); if (Z_STRLEN_PP(group) == 0) { @@ -245,43 +240,42 @@ *key_free = *key_str; return len; } else { - convert_to_string_ex(key); - *key_str = Z_STRVAL_PP(key); *key_free = NULL; - return Z_STRLEN_PP(key); + + convert_to_string(key); + *key_str = Z_STRVAL_P(key); + + return Z_STRLEN_P(key); } } /* }}} */ #define DBA_GET2 \ - zval **key; \ + zval *key; \ char *key_str, *key_free; \ size_t key_len; \ - if(ac != 2 || zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \ + return; \ } \ if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\ RETURN_FALSE; \ } #define DBA_GET2_3 \ - zval **key; \ + zval *key; \ char *key_str, *key_free; \ size_t key_len; \ - zval **tmp; \ int skip = 0; \ switch(ac) { \ case 2: \ - if (zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \ + return; \ } \ break; \ case 3: \ - if (zend_get_parameters_ex(ac, &key, &tmp, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters(ac TSRMLS_CC, "zlr", &key, &skip, &id) == FAILURE) { \ + return; \ } \ - convert_to_long_ex(tmp); \ - skip = Z_LVAL_PP(tmp); \ break; \ default: \ WRONG_PARAM_COUNT; \ @@ -290,25 +284,12 @@ RETURN_FALSE; \ } -#define DBA_GET3 \ - zval **key, **val; \ - char *key_str, *key_free; \ - size_t key_len; \ - if(ac != 3 || zend_get_parameters_ex(ac, &key, &val, &id) != SUCCESS) { \ - WRONG_PARAM_COUNT; \ - } \ - convert_to_string_ex(val); \ - if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\ - RETURN_FALSE; \ - } -#define DBA_ID_GET \ +#define DBA_FETCH_RESOURCE(info, id) \ ZEND_FETCH_RESOURCE2(info, dba_info *, id, -1, "DBA identifier", le_db, le_pdb); - -#define DBA_ID_GET1 DBA_ID_PARS; DBA_GET1; DBA_ID_GET -#define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_ID_GET -#define DBA_ID_GET2_3 DBA_ID_PARS; DBA_GET2_3; DBA_ID_GET -#define DBA_ID_GET3 DBA_ID_PARS; DBA_GET3; DBA_ID_GET + +#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) #define DBA_ID_DONE \ if (key_free) efree(key_free) @@ -566,28 +547,43 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) { char *v; - int len; - DBA_ID_GET3; + int val_len; + zval *id; + dba_info *info = NULL; + int ac = ZEND_NUM_ARGS(); + zval *key; + char *val; + char *key_str, *key_free; + size_t key_len; + + if (zend_parse_parameters(ac TSRMLS_CC, "zsr", &key, &val, &val_len, &id) == FAILURE) { + return; + } + + if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) { + RETURN_FALSE; + } + + DBA_FETCH_RESOURCE(info, &id); DBA_WRITE_CHECK; - + if (PG(magic_quotes_runtime)) { - len = Z_STRLEN_PP(val); - v = estrndup(Z_STRVAL_PP(val), len); - php_stripslashes(v, &len TSRMLS_CC); - if(info->hnd->update(info, key_str, key_len, v, len, mode TSRMLS_CC) == SUCCESS) { + v = estrndup(val, val_len); + php_stripslashes(v, &val_len TSRMLS_CC); + if (info->hnd->update(info, key_str, key_len, v, val_len, mode TSRMLS_CC) == SUCCESS) { efree(v); DBA_ID_DONE; RETURN_TRUE; } efree(v); } else { - if(info->hnd->update(info, key_str, key_len, VALLEN(val), mode TSRMLS_CC) == SUCCESS) - { + if (info->hnd->update(info, key_str, key_len, val, val_len, mode TSRMLS_CC) == SUCCESS) { DBA_ID_DONE; RETURN_TRUE; } } + DBA_ID_DONE; RETURN_FALSE; } @@ -980,9 +976,16 @@ Closes database */ PHP_FUNCTION(dba_close) { - DBA_ID_GET1; - - zend_list_delete(Z_RESVAL_PP(id)); + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + + zend_list_delete(Z_RESVAL_P(id)); } /* }}} */ @@ -1081,11 +1084,20 @@ { char *fkey; int len; - DBA_ID_GET1; + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); fkey = info->hnd->firstkey(info, &len TSRMLS_CC); - if(fkey) + + if (fkey) RETURN_STRINGL(fkey, len, 0); + RETURN_FALSE; } /* }}} */ @@ -1096,11 +1108,20 @@ { char *nkey; int len; - DBA_ID_GET1; + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); nkey = info->hnd->nextkey(info, &len TSRMLS_CC); - if(nkey) + + if (nkey) RETURN_STRINGL(nkey, len, 0); + RETURN_FALSE; } /* }}} */ @@ -1146,12 +1167,21 @@ Optimizes (e.g. clean up, vacuum) database */ PHP_FUNCTION(dba_optimize) { - DBA_ID_GET1; - + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + DBA_WRITE_CHECK; - if(info->hnd->optimize(info TSRMLS_CC) == SUCCESS) { + + if (info->hnd->optimize(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } + RETURN_FALSE; } /* }}} */ @@ -1160,11 +1190,19 @@ Synchronizes database */ PHP_FUNCTION(dba_sync) { - DBA_ID_GET1; - - if(info->hnd->sync(info TSRMLS_CC) == SUCCESS) { + zval *id; + dba_info *info = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) { + return; + } + + DBA_FETCH_RESOURCE(info, &id); + + if (info->hnd->sync(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } + RETURN_FALSE; } /* }}} */