diff options
| author | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
| commit | 2fd7d60ea06aa07b99dc219655be7ab42b7e2e16 (patch) | |
| tree | 2835e4d2625870eb707e0361a769e4921aff8609 /ext/dba/dba.c | |
| parent | a7d2747890846ed68cc86c6e8d3fd005525ff0cc (diff) | |
| parent | e9b23401514a642b58084784305c1d19cf86a823 (diff) | |
| download | php-git-2fd7d60ea06aa07b99dc219655be7ab42b7e2e16.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/dba/dba.c')
| -rw-r--r-- | ext/dba/dba.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 6bb98e24b5..de4ea4c464 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -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() @@ -519,7 +519,7 @@ PHP_MSHUTDOWN_FUNCTION(dba) } /* }}} */ -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str.h" /* {{{ PHP_MINFO_FUNCTION */ |