diff options
Diffstat (limited to 'ext/dba/dba.c')
-rw-r--r-- | ext/dba/dba.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 7b675ac6ac..b1f618a992 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -256,7 +256,7 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS zval *key; \ char *key_str, *key_free; \ size_t key_len; \ - long skip = 0; \ + zend_long skip = 0; \ switch(ac) { \ case 2: \ if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \ @@ -470,19 +470,19 @@ ZEND_INI_MH(OnUpdateDefaultHandler) { dba_handler *hptr; - if (!strlen(new_value)) { + if (!new_value->len) { DBA_G(default_hptr) = NULL; - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } - for (hptr = handler; hptr->name && strcasecmp(hptr->name, new_value); hptr++); + for (hptr = handler; hptr->name && strcasecmp(hptr->name, new_value->val); hptr++); if (!hptr->name) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", new_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", new_value->val); return FAILURE; } DBA_G(default_hptr) = hptr; - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } PHP_INI_BEGIN() @@ -551,7 +551,7 @@ PHP_MINFO_FUNCTION(dba) */ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) { - int val_len; + size_t val_len; zval *id; dba_info *info = NULL; int ac = ZEND_NUM_ARGS(); @@ -1054,7 +1054,7 @@ PHP_FUNCTION(dba_key_split) { zval *zkey; char *key, *name; - int key_len; + size_t key_len; if (ZEND_NUM_ARGS() != 1) { WRONG_PARAM_COUNT; @@ -1243,7 +1243,7 @@ PHP_FUNCTION(dba_handlers) List opened databases */ PHP_FUNCTION(dba_list) { - ulong numitems, i; + zend_ulong numitems, i; zend_resource *le; dba_info *info; |