From: Tjerk Meesters Date: Thu, 3 Mar 2016 22:48:45 +0000 (+0100) Subject: Fix one zpp usage in interbase X-Git-Tag: php-7.0.5RC1~19 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7028d96;p=php Fix one zpp usage in interbase Also small tweak to zpp REAME --- diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API index c344817b37..7f3da76f80 100644 --- a/README.PARAMETER_PARSING_API +++ b/README.PARAMETER_PARSING_API @@ -63,10 +63,10 @@ Type specifiers o - object of any type (zval*) O - object of specific type given by class entry (zval*, zend_class_entry) p - valid path (string without null bytes in the middle) and its length (char*, size_t) - P - valid path (string without null bytes in the middle) as zend_string (zend_string) + P - valid path (string without null bytes in the middle) as zend_string (zend_string*) r - resource (zval*) s - string (with possible null bytes) and its length (char*, size_t) - S - string (with possible null bytes) as zend_string (zend_string) + S - string (with possible null bytes) as zend_string (zend_string*) z - the actual zval (zval*) * - variable arguments list (0 or more) + - variable arguments list (1 or more) diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index d1174cf576..3f9ac58ce1 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -884,7 +884,8 @@ int _php_ibase_attach_db(char **args, int *len, zend_long *largs, isc_db_handle static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* {{{ */ { char *c, hash[16], *args[] = { NULL, NULL, NULL, NULL, NULL }; - int i, len[] = { 0, 0, 0, 0, 0 }; + int i; + size_t len[] = { 0, 0, 0, 0, 0 }; zend_long largs[] = { 0, 0, 0 }; PHP_MD5_CTX hash_context; zend_resource new_index_ptr, *le;