com php-src: Fix ext/dba ini handling: ext/dba/dba.c

From: Date: Thu, 11 Sep 2014 14:06:31 +0000
Subject: com php-src: Fix ext/dba ini handling: ext/dba/dba.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81509@lists.php.net to get a copy of this message
Commit: fca85d92cc7671c9b24f596407b7eca6068883f1 Author: Nikita Popov <nikic@php.net> Thu, 11 Sep 2014 16:05:39 +0200 Parents: b8c36e199e628c15bb06f2599a7a33b3e41063cd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fca85d92cc7671c9b24f596407b7eca6068883f1 Log: Fix ext/dba ini handling Doing this change blindly based on gcov output Changed paths: M ext/dba/dba.c Diff: diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 6bb98e2...b1f618a 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -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()

« previous php.cvs (#81509) next »