clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

first show to make 's' work with size_t

Browse Source
This commit is contained in:
Anatol Belski 2014-08-27 15:31:48 +02:00
parent ee552b628c
commit 3234480827
176 changed files with 738 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend.c
View File

@ -301,7 +301,7 @@ ZEND_API int zend_print_zval(zval *expr, int indent TSRMLS_DC) /* {{{ */
ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC) /* {{{ */
{
zend_string *str = zval_get_string(expr);
int len = str->len;
size_t len = str->len;
if (len != 0) {
write_func(str->val, len);

4
Zend/zend_API.c
View File

@ -221,7 +221,7 @@ ZEND_API zend_string *zend_get_object_classname(const zend_object *object TSRMLS
}
/* }}} */
static int parse_arg_object_to_string(zval *arg, char **p, int *pl, int type TSRMLS_DC) /* {{{ */
static int parse_arg_object_to_string(zval *arg, char **p, size_t *pl, int type TSRMLS_DC) /* {{{ */
{
if (Z_OBJ_HANDLER_P(arg, cast_object)) {
zval obj;
@ -516,7 +516,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
case 's':
{
char **p = va_arg(*va, char **);
int *pl = va_arg(*va, int *);
size_t *pl = va_arg(*va, size_t *);
switch (Z_TYPE_P(arg)) {
case IS_NULL:
if (check_null) {

4
Zend/zend_API.h
View File

@ -1173,7 +1173,7 @@ static zend_always_inline int _z_param_str(zval *arg, zend_string **dest, int ch
return 1;
}
static zend_always_inline int _z_param_string(zval *arg, char **dest, int *dest_len, int check_null TSRMLS_DC)
static zend_always_inline int _z_param_string(zval *arg, char **dest, size_t *dest_len, int check_null TSRMLS_DC)
{
zend_string *str;
@ -1200,7 +1200,7 @@ static zend_always_inline int _z_param_path_str(zval *arg, zend_string **dest, i
return 1;
}
static zend_always_inline int _z_param_path(zval *arg, char **dest, int *dest_len, int check_null TSRMLS_DC)
static zend_always_inline int _z_param_path(zval *arg, char **dest, size_t *dest_len, int check_null TSRMLS_DC)
{
zend_string *str;

15
Zend/zend_builtin_functions.c
View File

@ -676,7 +676,7 @@ ZEND_FUNCTION(each)
ZEND_FUNCTION(error_reporting)
{
char *err;
int err_len;
size_t err_len;
int old_error_reporting;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &err, &err_len) == FAILURE) {
@ -1398,7 +1398,7 @@ ZEND_FUNCTION(trait_exists)
ZEND_FUNCTION(function_exists)
{
char *name;
int name_len;
size_t name_len;
zend_function *func;
zend_string *lcname;
@ -1440,7 +1440,7 @@ ZEND_FUNCTION(class_alias)
zend_string *class_name;
char *alias_name;
zend_class_entry *ce;
int alias_name_len;
size_t alias_name_len;
zend_bool autoload = 1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ss|b", &class_name, &alias_name, &alias_name_len, &autoload) == FAILURE) {
@ -1543,7 +1543,7 @@ ZEND_FUNCTION(trigger_error)
{
zend_long error_type = E_USER_NOTICE;
char *message;
int message_len;
size_t message_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &message, &message_len, &error_type) == FAILURE) {
return;
@ -1836,7 +1836,7 @@ ZEND_FUNCTION(create_function)
{
zend_string *function_name;
char *eval_code, *function_args, *function_code;
int eval_code_length, function_args_len, function_code_len;
size_t eval_code_length, function_args_len, function_code_len;
int retval;
char *eval_name;
@ -2567,7 +2567,7 @@ ZEND_FUNCTION(debug_backtrace)
ZEND_FUNCTION(extension_loaded)
{
char *extension_name;
int extension_name_len;
size_t extension_name_len;
zend_string *lcname;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) {
@ -2592,7 +2592,8 @@ ZEND_FUNCTION(get_extension_funcs)
{
char *extension_name;
zend_string *lcname;
int extension_name_len, array;
size_t extension_name_len;
int array;
zend_module_entry *module;
zend_function *zif;

3
Zend/zend_exceptions.c
View File

@ -227,7 +227,8 @@ ZEND_METHOD(error_exception, __construct)
char *message = NULL, *filename = NULL;
zend_long code = 0, severity = E_ERROR, lineno;
zval *object, *previous = NULL;
int argc = ZEND_NUM_ARGS(), message_len, filename_len;
int argc = ZEND_NUM_ARGS();
size_t message_len, filename_len;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|sllslO!", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno, &previous, default_exception_ce) == FAILURE) {
zend_error(E_ERROR, "Wrong parameters for ErrorException([string $exception [, long $code, [ long $severity, [ string $filename, [ long $lineno [, Exception $previous = NULL]]]]]])");

16
ext/bcmath/bcmath.c
View File

@ -208,7 +208,7 @@ PHP_FUNCTION(bcadd)
char *left, *right;
zend_long scale_param = 0;
bc_num first, second, result;
int left_len, right_len;
size_t left_len, right_len;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
@ -243,7 +243,7 @@ PHP_FUNCTION(bcadd)
PHP_FUNCTION(bcsub)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
zend_long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@ -280,7 +280,7 @@ PHP_FUNCTION(bcsub)
PHP_FUNCTION(bcmul)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
zend_long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@ -317,7 +317,7 @@ PHP_FUNCTION(bcmul)
PHP_FUNCTION(bcdiv)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
zend_long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@ -360,7 +360,7 @@ PHP_FUNCTION(bcdiv)
PHP_FUNCTION(bcmod)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
bc_num first, second, result;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &left, &left_len, &right, &right_len) == FAILURE) {
@ -394,7 +394,7 @@ PHP_FUNCTION(bcmod)
PHP_FUNCTION(bcpowmod)
{
char *left, *right, *modulous;
int left_len, right_len, modulous_len;
size_t left_len, right_len, modulous_len;
bc_num first, second, mod, result;
zend_long scale = BCG(bc_precision);
int scale_int;
@ -435,7 +435,7 @@ PHP_FUNCTION(bcpowmod)
PHP_FUNCTION(bcpow)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
zend_long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@ -507,7 +507,7 @@ PHP_FUNCTION(bcsqrt)
PHP_FUNCTION(bccomp)
{
char *left, *right;
int left_len, right_len;
size_t left_len, right_len;
zend_long scale_param = 0;
bc_num first, second;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();

4
ext/bz2/bz2.c
View File

@ -377,7 +377,7 @@ static PHP_FUNCTION(bzopen)
{
zval *file; /* The file to open */
char *mode; /* The mode to open the stream with */
int mode_len;
size_t mode_len;
BZFILE *bz; /* The compressed file stream */
php_stream *stream = NULL;
@ -497,7 +497,7 @@ static PHP_FUNCTION(bzcompress)
block_size = 4, /* Block size for compression algorithm */
work_factor = 0, /* Work factor for compression algorithm */
argc; /* Argument count */
int source_len; /* Length of the source data */
size_t source_len; /* Length of the source data */
unsigned int dest_len; /* Length of the destination buffer */
argc = ZEND_NUM_ARGS();

8
ext/com_dotnet/com_com.c
View File

@ -37,7 +37,7 @@ PHP_FUNCTION(com_create_instance)
php_com_dotnet_object *obj;
char *module_name, *typelib_name = NULL, *server_name = NULL;
char *user_name = NULL, *domain_name = NULL, *password = NULL;
int module_name_len, typelib_name_len, server_name_len,
size_t module_name_len, typelib_name_len, server_name_len,
user_name_len, domain_name_len, password_len;
OLECHAR *moniker;
CLSID clsid;
@ -349,7 +349,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
if (silent == 0 && FAILED(hr)) {
char *source = NULL, *desc = NULL, *msg = NULL;
int source_len, desc_len;
size_t source_len, desc_len;
switch (hr) {
case DISP_E_EXCEPTION:
@ -416,7 +416,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
/* map an ID to a name */
HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name,
int namelen, DISPID *dispid TSRMLS_DC)
size_t namelen, DISPID *dispid TSRMLS_DC)
{
OLECHAR *olename;
HRESULT hr;
@ -750,7 +750,7 @@ PHP_FUNCTION(com_print_typeinfo)
zval *arg1;
char *ifacename = NULL;
char *typelibname = NULL;
int ifacelen;
size_t ifacelen;
zend_bool wantsink = 0;
php_com_dotnet_object *obj = NULL;
ITypeInfo *typeinfo;

2
ext/com_dotnet/com_dotnet.c
View File

@ -188,7 +188,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
zval *object = getThis();
php_com_dotnet_object *obj;
char *assembly_name, *datatype_name;
int assembly_name_len, datatype_name_len;
size_t assembly_name_len, datatype_name_len;
struct dotnet_runtime_stuff *stuff;
OLECHAR *oleassembly, *oletype;
BSTR oleassembly_sys, oletype_sys;

4
ext/com_dotnet/com_olechar.c
View File

@ -30,7 +30,7 @@
#include "php_com_dotnet_internal.h"
PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, size_t string_len, int codepage TSRMLS_DC)
{
OLECHAR *olestring = NULL;
DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS;
@ -71,7 +71,7 @@ PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint strin
return olestring;
}
PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, size_t *string_len, int codepage TSRMLS_DC)
{
char *string;
uint length = 0;

6
ext/com_dotnet/com_persist.c
View File

@ -349,7 +349,7 @@ CPH_METHOD(GetCurFileName)
res = IPersistFile_GetCurFile(helper->ipf, &olename);
if (res == S_OK) {
int len;
size_t len;
char *str = php_com_olestring_to_string(olename,
&len, helper->codepage TSRMLS_CC);
RETVAL_STRINGL(str, len);
@ -375,7 +375,7 @@ CPH_METHOD(SaveToFile)
{
HRESULT res;
char *filename, *fullpath = NULL;
int filename_len;
size_t filename_len;
zend_bool remember = TRUE;
OLECHAR *olefilename = NULL;
CPH_FETCH();
@ -438,7 +438,7 @@ CPH_METHOD(LoadFromFile)
{
HRESULT res;
char *filename, *fullpath;
int filename_len;
size_t filename_len;
zend_long flags = 0;
OLECHAR *olefilename;
CPH_FETCH();

7
ext/com_dotnet/com_typeinfo.c
View File

@ -164,7 +164,7 @@ PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepa
zend_constant c;
zval *exists, results, value;
char *const_name;
int len;
size_t len;
if (TL == NULL) {
return FAILURE;
@ -437,7 +437,7 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri
int i;
OLECHAR *olename;
char *ansiname = NULL;
unsigned int ansinamelen;
size_t ansinamelen;
int ret = 0;
if (FAILED(ITypeInfo_GetTypeAttr(typeinfo, &attr))) {
@ -491,7 +491,8 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri
if (printdef) {
int j;
char *funcdesc;
unsigned int funcdesclen, cnames = 0;
size_t funcdesclen;
unsigned int cnames = 0;
BSTR *names;
names = (BSTR*)safe_emalloc((func->cParams + 1), sizeof(BSTR), 0);

4
ext/com_dotnet/php_com_dotnet_internal.h
View File

@ -87,9 +87,9 @@ int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS
/* com_olechar.c */
PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring,
uint *string_len, int codepage TSRMLS_DC);
size_t *string_len, int codepage TSRMLS_DC);
PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string,
uint string_len, int codepage TSRMLS_DC);
size_t string_len, int codepage TSRMLS_DC);
/* com_com.c */

4
ext/curl/curl_file.c
View File

@ -32,7 +32,7 @@ PHP_CURL_API zend_class_entry *curl_CURLFile_class;
static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
char *fname = NULL, *mime = NULL, *postname = NULL;
int fname_len, mime_len, postname_len;
size_t fname_len, mime_len, postname_len;
zval *cf = return_value;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
@ -83,7 +83,7 @@ static void curlfile_get_property(char *name, INTERNAL_FUNCTION_PARAMETERS)
static void curlfile_set_property(char *name, INTERNAL_FUNCTION_PARAMETERS)
{
char *arg = NULL;
int arg_len;
size_t arg_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
return;

4
ext/curl/interface.c
View File

@ -1852,7 +1852,7 @@ PHP_FUNCTION(curl_init)
php_curl *ch;
CURL *cp;
char *url = NULL;
int url_len = 0;
size_t url_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &url, &url_len) == FAILURE) {
return;
@ -3314,7 +3314,7 @@ PHP_FUNCTION(curl_reset)
PHP_FUNCTION(curl_escape)
{
char *str = NULL, *res = NULL;
int str_len = 0;
size_t str_len = 0;
zval *zid;
php_curl *ch;

21
ext/date/php_date.c
View File

@ -1055,7 +1055,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d)
/* }}} */
/* {{{ date_format - (gm)date helper */
static zend_string *date_format(char *format, int format_len, timelib_time *t, int localtime TSRMLS_DC)
static zend_string *date_format(char *format, size_t format_len, timelib_time *t, size_t localtime TSRMLS_DC)
{
smart_str string = {0};
int i, length = 0;
@ -1216,7 +1216,7 @@ static zend_string *date_format(char *format, int format_len, timelib_time *t, i
static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime)
{
char *format;
int format_len;
size_t format_len;
zend_long ts;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) {
@ -1440,7 +1440,8 @@ PHPAPI zend_long php_parse_date(char *string, zend_long *now)
PHP_FUNCTION(strtotime)
{
char *times, *initial_ts;
int time_len, error1, error2;
size_t time_len;
int error1, error2;
struct timelib_error_container *error;
zend_long preset_ts = 0, ts;
@ -2503,7 +2504,7 @@ static void update_errors_warnings(timelib_error_container *last_errors TSRMLS_D
DATEG(last_errors) = last_errors;
} /* }}} */
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC) /* {{{ */
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, size_t time_str_len, char *format, zval *timezone_object, size_t ctor TSRMLS_DC) /* {{{ */
{
timelib_time *now;
timelib_tzinfo *tzi = NULL;
@ -2641,7 +2642,7 @@ PHP_FUNCTION(date_create_from_format)
{
zval *timezone_object = NULL;
char *time_str = NULL, *format_str = NULL;
int time_str_len = 0, format_str_len = 0;
size_t time_str_len = 0, format_str_len = 0;
zval datetime_object;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|O", &format_str, &format_str_len, &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) {
@ -2979,7 +2980,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *
PHP_FUNCTION(date_parse)
{
char *date;
int date_len;
size_t date_len;
struct timelib_error_container *error;
timelib_time *parsed_time;
@ -3781,7 +3782,7 @@ PHP_FUNCTION(timezone_name_from_abbr)
{
char *abbr;
char *tzid;
int abbr_len;
size_t abbr_len;
zend_long gmtoffset = -1;
zend_long isdst = -1;
@ -4336,7 +4337,7 @@ PHP_METHOD(DatePeriod, __construct)
zval *start, *end = NULL, *interval;
zend_long recurrences = 0, options = 0;
char *isostr = NULL;
int isostr_len = 0;
size_t isostr_len = 0;
timelib_time *clone;
zend_error_handling error_handling;
@ -4439,7 +4440,7 @@ PHP_FUNCTION(timezone_identifiers_list)
int i, item_count;
zend_long what = PHP_DATE_TIMEZONE_GROUP_ALL;
char *option = NULL;
int option_len = 0;
size_t option_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &what, &option, &option_len) == FAILURE) {
RETURN_FALSE;
@ -4521,7 +4522,7 @@ PHP_FUNCTION(timezone_abbreviations_list)
PHP_FUNCTION(date_default_timezone_set)
{
char *zone;
int zone_len;
size_t zone_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &zone, &zone_len) == FAILURE) {
RETURN_FALSE;

2
ext/date/php_date.h
View File

@ -222,7 +222,7 @@ PHPAPI zend_class_entry *php_date_get_timezone_ce(void);
/* Functions for creating DateTime objects, and initializing them from a string */
PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC);
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC);
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, size_t time_str_len, char *format, zval *timezone_object, size_t ctor TSRMLS_DC);
#endif /* PHP_DATE_H */

4
ext/dba/dba.c
View File

@ -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;

2
ext/dom/attr.c
View File

@ -60,7 +60,7 @@ PHP_METHOD(domattr, __construct)
xmlNodePtr oldnode = NULL;
dom_object *intern;
char *name, *value = NULL;
int name_len, value_len, name_valid;
size_t name_len, value_len, name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

2
ext/dom/cdatasection.c
View File

@ -54,7 +54,7 @@ PHP_METHOD(domcdatasection, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
int value_len;
size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

2
ext/dom/characterdata.c
View File

@ -205,7 +205,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
xmlNode *nodep;
dom_object *intern;
char *arg;
int arg_len;
size_t arg_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) {
return;

2
ext/dom/comment.c
View File

@ -54,7 +54,7 @@ PHP_METHOD(domcomment, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
int value_len;
size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

16
ext/dom/document.c
View File

@ -697,7 +697,8 @@ PHP_FUNCTION(dom_document_create_element)
xmlNode *node;
xmlDocPtr docp;
dom_object *intern;
int ret, name_len, value_len;
int ret;
size_t name_len, value_len;
char *name, *value = NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) {
@ -756,7 +757,8 @@ PHP_FUNCTION(dom_document_create_text_node)
zval *id;
xmlNode *node;
xmlDocPtr docp;
int ret, value_len;
int ret;
size_t value_len;
dom_object *intern;
char *value;
@ -941,7 +943,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
{
zval *id;
xmlDocPtr docp;
int name_len;
size_t name_len;
dom_object *intern, *namednode;
char *name;
xmlChar *local;
@ -1150,7 +1152,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
{
zval *id;
xmlDocPtr docp;
int uri_len, name_len;
size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;
xmlChar *local, *nsuri;
@ -1247,7 +1249,7 @@ PHP_METHOD(domdocument, __construct)
xmlDoc *docp = NULL, *olddoc;
dom_object *intern;
char *encoding, *version = NULL;
int encoding_len = 0, version_len = 0, refcount;
size_t encoding_len = 0, version_len = 0, refcount;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
@ -1341,7 +1343,7 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p
}
/* }}} */
static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int source_len, int options TSRMLS_DC) /* {{{ */
static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t source_len, size_t options TSRMLS_DC) /* {{{ */
{
xmlDocPtr ret;
xmlParserCtxtPtr ctxt = NULL;
@ -1543,7 +1545,7 @@ PHP_FUNCTION(dom_document_save)
{
zval *id;
xmlDoc *docp;
int file_len = 0, bytes, format, saveempty = 0;
size_t file_len = 0, bytes, format, saveempty = 0;
dom_object *intern;
dom_doc_propsptr doc_props;
char *file;

2
ext/dom/documentfragment.c
View File

@ -122,7 +122,7 @@ PHP_METHOD(domdocumentfragment, appendXML) {
xmlNode *nodep;
dom_object *intern;
char *data = NULL;
int data_len = 0;
size_t data_len = 0;
int err;
xmlNodePtr lst;

8
ext/dom/domimplementation.c
View File

@ -70,7 +70,7 @@ Since:
*/
PHP_METHOD(domimplementation, hasFeature)
{
int feature_len, version_len;
size_t feature_len, version_len;
char *feature, *version;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &feature, &feature_len, &version, &version_len) == FAILURE) {
@ -92,7 +92,8 @@ Since: DOM Level 2
PHP_METHOD(domimplementation, createDocumentType)
{
xmlDtd *doctype;
int ret, name_len = 0, publicid_len = 0, systemid_len = 0;
int ret;
size_t name_len = 0, publicid_len = 0, systemid_len = 0;
char *name = NULL, *publicid = NULL, *systemid = NULL;
xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL;
xmlURIPtr uri;
@ -155,7 +156,8 @@ PHP_METHOD(domimplementation, createDocument)
xmlNode *nodep;
xmlDtdPtr doctype = NULL;
xmlNsPtr nsptr = NULL;
int ret, uri_len = 0, name_len = 0, errorcode = 0;
int ret, errorcode = 0;
size_t uri_len = 0, name_len = 0;
char *uri = NULL, *name = NULL;
char *prefix = NULL, *localname = NULL;
dom_object *doctobj;

10
ext/dom/element.c
View File

@ -160,7 +160,8 @@ PHP_METHOD(domelement, __construct)
char *name, *value = NULL, *uri = NULL;
char *localname = NULL, *prefix = NULL;
int errorcode = 0, uri_len = 0;
int name_len, value_len = 0, name_valid;
size_t name_len, value_len = 0;
int name_valid;
xmlNsPtr nsptr = NULL;
zend_error_handling error_handling;
@ -370,7 +371,8 @@ PHP_FUNCTION(dom_element_set_attribute)
zval *id;
xmlNode *nodep;
xmlNodePtr attr = NULL;
int ret, name_len, value_len, name_valid;
int ret, name_valid;
size_t name_len, value_len;
dom_object *intern;
char *name, *value;
@ -660,7 +662,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
xmlNodePtr elemp;
xmlNsPtr nsptr;
dom_object *intern;
int uri_len = 0, name_len = 0;
size_t uri_len = 0, name_len = 0;
char *uri, *name;
xmlChar *strattr;
@ -740,7 +742,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
xmlNodePtr elemp, nodep = NULL;
xmlNsPtr nsptr;
xmlAttr *attr;
int uri_len = 0, name_len = 0, value_len = 0;
size_t uri_len = 0, name_len = 0, value_len = 0;
char *uri, *name, *value;
char *localname = NULL, *prefix = NULL;
dom_object *intern;

2
ext/dom/entityreference.c
View File

@ -53,7 +53,7 @@ PHP_METHOD(domentityreference, __construct)
xmlNodePtr oldnode = NULL;
dom_object *intern;
char *name;
int name_len, name_valid;
size_t name_len, name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

6
ext/dom/namednodemap.c
View File

@ -126,7 +126,8 @@ Since:
PHP_FUNCTION(dom_namednodemap_get_named_item)
{
zval *id;
int ret, namedlen=0;
int ret;
size_t namedlen=0;
dom_object *intern;
xmlNodePtr itemnode = NULL;
char *named;
@ -258,7 +259,8 @@ Since: DOM Level 2
PHP_FUNCTION(dom_namednodemap_get_named_item_ns)
{
zval *id;
int ret, namedlen=0, urilen=0;
int ret;
size_t namedlen=0, urilen=0;
dom_object *intern;
xmlNodePtr itemnode = NULL;
char *uri, *named;

11
ext/dom/node.c
View File

@ -1413,7 +1413,7 @@ Since: DOM Level 2
PHP_FUNCTION(dom_node_is_supported)
{
zval *id;
int feature_len, version_len;
size_t feature_len, version_len;
char *feature, *version;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) {
@ -1501,7 +1501,7 @@ PHP_FUNCTION(dom_node_lookup_prefix)
xmlNodePtr nodep, lookupp = NULL;
dom_object *intern;
xmlNsPtr nsptr;
int uri_len = 0;
size_t uri_len = 0;
char *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) {
@ -1551,7 +1551,7 @@ PHP_FUNCTION(dom_node_is_default_namespace)
xmlNodePtr nodep;
dom_object *intern;
xmlNsPtr nsptr;
int uri_len = 0;
size_t uri_len = 0;
char *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) {
@ -1584,7 +1584,7 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri)
xmlNodePtr nodep;
dom_object *intern;
xmlNsPtr nsptr;
int prefix_len = 0;
size_t prefix_len = 0;
char *prefix=NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) {
@ -1659,7 +1659,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
zend_bool exclusive=0, with_comments=0;
xmlChar **inclusive_ns_prefixes = NULL;
char *file = NULL;
int ret = -1, file_len = 0;
int ret = -1;
size_t file_len = 0;
xmlOutputBufferPtr buf;
xmlXPathContextPtr ctxp=NULL;
xmlXPathObjectPtr xpathobjp=NULL;

3
ext/dom/processinginstruction.c
View File

@ -54,7 +54,8 @@ PHP_METHOD(domprocessinginstruction, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *name, *value = NULL;
int name_len, value_len, name_valid;
size_t name_len, value_len;
int name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

2
ext/dom/text.c
View File

@ -69,7 +69,7 @@ PHP_METHOD(domtext, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
int value_len;
size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);

4
ext/dom/xpath.c
View File

@ -319,7 +319,7 @@ PHP_FUNCTION(dom_xpath_register_ns)
{
zval *id;
xmlXPathContextPtr ctxp;
int prefix_len, ns_uri_len;
size_t prefix_len, ns_uri_len;
dom_xpath_object *intern;
unsigned char *prefix, *ns_uri;
@ -357,7 +357,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
xmlXPathContextPtr ctxp;
xmlNodePtr nodep = NULL;
xmlXPathObjectPtr xpathobjp;
int expr_len, nsnbr = 0, xpath_type;
size_t expr_len, nsnbr = 0, xpath_type;
dom_xpath_object *intern;
dom_object *nodeobj;
char *expr;

18
ext/enchant/enchant.c
View File

@ -424,7 +424,7 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
enchant_broker *pbroker;
zend_long dict_type;
char *value;
int value_len;
size_t value_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &broker, &dict_type, &value, &value_len) == FAILURE) {
RETURN_FALSE;
@ -583,7 +583,7 @@ PHP_FUNCTION(enchant_broker_request_pwl_dict)
enchant_dict *dict;
EnchantDict *d;
char *pwl;
int pwllen;
size_t pwllen;
int pos;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &broker, &pwl, &pwllen) == FAILURE) {
@ -713,7 +713,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
{
zval *dict, *sugg = NULL;
char *word;
int wordlen;
size_t wordlen;
enchant_dict *pdict;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|z/", &dict, &word, &wordlen, &sugg) == FAILURE) {
@ -759,7 +759,7 @@ PHP_FUNCTION(enchant_dict_check)
{
zval *dict;
char *word;
int wordlen;
size_t wordlen;
enchant_dict *pdict;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
@ -778,7 +778,7 @@ PHP_FUNCTION(enchant_dict_suggest)
{
zval *dict;
char *word;
int wordlen;
size_t wordlen;
char **suggs;
enchant_dict *pdict;
int n_sugg;
@ -811,7 +811,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal)
{
zval *dict;
char *word;
int wordlen;
size_t wordlen;
enchant_dict *pdict;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
@ -830,7 +830,7 @@ PHP_FUNCTION(enchant_dict_add_to_session)
{
zval *dict;
char *word;
int wordlen;
size_t wordlen;
enchant_dict *pdict;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
@ -849,7 +849,7 @@ PHP_FUNCTION(enchant_dict_is_in_session)
{
zval *dict;
char *word;
int wordlen;
size_t wordlen;
enchant_dict *pdict;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
@ -871,7 +871,7 @@ PHP_FUNCTION(enchant_dict_store_replacement)
{
zval *dict;
char *mis, *cor;
int mislen, corlen;
size_t mislen, corlen;
enchant_dict *pdict;

6
ext/ereg/ereg.c
View File

@ -294,7 +294,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
zval *regex, /* Regular expression */
*array = NULL; /* Optional register array */
char *findin; /* String to apply expression to */
int findin_len;
size_t findin_len;
regex_t re;
regmatch_t *subs;
int err, match_len, string_len;
@ -634,7 +634,7 @@ static void php_split(INTERNAL_FUNCTION_PARAMETERS, int icase)
regex_t re;
regmatch_t subs[1];
char *spliton, *str, *strp, *endp;
int spliton_len, str_len;
size_t spliton_len, str_len;
int err, size, copts = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &spliton, &spliton_len, &str, &str_len, &count) == FAILURE) {
@ -733,7 +733,7 @@ PHP_FUNCTION(spliti)
PHP_EREG_API PHP_FUNCTION(sql_regcase)
{
char *string, *tmp;
int string_len;
size_t string_len;
unsigned char c;
register int i, j;

4
ext/exif/exif.c
View File

@ -3912,7 +3912,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
PHP_FUNCTION(exif_read_data)
{
char *p_name, *p_sections_needed = NULL;
int p_name_len, p_sections_needed_len = 0;
size_t p_name_len, p_sections_needed_len = 0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
int i, ret, sections_needed=0;
@ -4154,7 +4154,7 @@ PHP_FUNCTION(exif_thumbnail)
PHP_FUNCTION(exif_imagetype)
{
char *imagefile;
int imagefile_len;
size_t imagefile_len;
php_stream * stream;
int itype = 0;

4
ext/fileinfo/fileinfo.c
View File

@ -297,7 +297,7 @@ PHP_FUNCTION(finfo_open)
{
zend_long options = MAGIC_NONE;
char *file = NULL;
int file_len = 0;
size_t file_len = 0;
php_fileinfo *finfo;
FILEINFO_DECLARE_INIT_OBJECT(object)
char resolved_path[MAXPATHLEN];
@ -414,7 +414,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
{
zend_long options = 0;
char *ret_val = NULL, *buffer = NULL;
int buffer_len;
size_t buffer_len;
php_fileinfo *finfo = NULL;
zval *zfinfo, *zcontext = NULL;
zval *what;

3
ext/filter/filter.c
View File

@ -870,7 +870,8 @@ PHP_FUNCTION(filter_list)
* Returns the filter ID belonging to a named filter */
PHP_FUNCTION(filter_id)
{
int i, filter_len;
int i;
size_t filter_len;
int size = sizeof(filter_list) / sizeof(filter_list_entry);
char *filter;

28
ext/ftp/php_ftp.c
View File

@ -343,7 +343,7 @@ PHP_FUNCTION(ftp_connect)
{
ftpbuf_t *ftp;
char *host;
int host_len;
size_t host_len;
zend_long port = 0;
zend_long timeout_sec = FTP_DEFAULT_TIMEOUT;
@ -379,7 +379,7 @@ PHP_FUNCTION(ftp_ssl_connect)
{
ftpbuf_t *ftp;
char *host;
int host_len;
size_t host_len;
zend_long port = 0;
zend_long timeout_sec = FTP_DEFAULT_TIMEOUT;
@ -484,7 +484,7 @@ PHP_FUNCTION(ftp_chdir)
zval *z_ftp;
ftpbuf_t *ftp;
char *dir;
int dir_len;
size_t dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
return;
@ -509,7 +509,7 @@ PHP_FUNCTION(ftp_exec)
zval *z_ftp;
ftpbuf_t *ftp;
char *cmd;
int cmd_len;
size_t cmd_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
return;
@ -534,7 +534,7 @@ PHP_FUNCTION(ftp_raw)
zval *z_ftp;
ftpbuf_t *ftp;
char *cmd;
int cmd_len;
size_t cmd_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
return;
@ -605,7 +605,7 @@ PHP_FUNCTION(ftp_chmod)
zval *z_ftp;
ftpbuf_t *ftp;
char *filename;
int filename_len;
size_t filename_len;
zend_long mode;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) {
@ -741,7 +741,7 @@ PHP_FUNCTION(ftp_fget)
ftptype_t xtype;
php_stream *stream;
char *file;
int file_len;
size_t file_len;
zend_long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
@ -785,7 +785,7 @@ PHP_FUNCTION(ftp_nb_fget)
ftptype_t xtype;
php_stream *stream;
char *file;
int file_len;
size_t file_len;
zend_long mode, resumepos=0, ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
@ -855,7 +855,7 @@ PHP_FUNCTION(ftp_get)
ftptype_t xtype;
php_stream *outstream;
char *local, *remote;
int local_len, remote_len;
size_t local_len, remote_len;
zend_long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
@ -1024,7 +1024,7 @@ PHP_FUNCTION(ftp_fput)
zval *z_ftp, *z_file;
ftpbuf_t *ftp;
ftptype_t xtype;
int remote_len;
size_t remote_len;
zend_long mode, startpos=0;
php_stream *stream;
char *remote;
@ -1236,7 +1236,7 @@ PHP_FUNCTION(ftp_size)
zval *z_ftp;
ftpbuf_t *ftp;
char *file;
int file_len;
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &z_ftp, &file, &file_len) == FAILURE) {
return;
@ -1256,7 +1256,7 @@ PHP_FUNCTION(ftp_mdtm)
zval *z_ftp;
ftpbuf_t *ftp;
char *file;
int file_len;
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &z_ftp, &file, &file_len) == FAILURE) {
return;
@ -1276,7 +1276,7 @@ PHP_FUNCTION(ftp_rename)
zval *z_ftp;
ftpbuf_t *ftp;
char *src, *dest;
int src_len, dest_len;
size_t src_len, dest_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &z_ftp, &src, &src_len, &dest, &dest_len) == FAILURE) {
return;
@ -1301,7 +1301,7 @@ PHP_FUNCTION(ftp_delete)
zval *z_ftp;
ftpbuf_t *ftp;
char *file;
int file_len;
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &file, &file_len) == FAILURE) {
return;

11
ext/gd/gd.c
View File

@ -2343,7 +2343,7 @@ PHP_FUNCTION(imagecreatefromstring)
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)())
{
char *file;
int file_len;
size_t file_len;
zend_long srcx, srcy, width, height;
gdImagePtr im = NULL;
php_stream *stream;
@ -3514,7 +3514,7 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
zval *IM;
zend_long SIZE, X, Y, COL;
char *C;
int C_len;
size_t C_len;
gdImagePtr im;
int ch = 0, col, x, y, size, i, l = 0;
unsigned char *str = NULL;
@ -3805,7 +3805,8 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
zval *IM, *EXT = NULL;
gdImagePtr im=NULL;
zend_long col = -1, x = -1, y = -1;
int str_len, fontname_len, i, brect[8];
size_t str_len, fontname_len;
int i, brect[8];
double ptsize, angle;
char *str = NULL, *fontname = NULL;
char *error = NULL;
@ -4022,7 +4023,7 @@ PHP_FUNCTION(imagepsencodefont)
{
zval *fnt;
char *enc, **enc_vector;
int enc_len, *f_ind;
size_t enc_len, *f_ind;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &fnt, &enc, &enc_len) == FAILURE) {
return;
@ -4422,7 +4423,7 @@ static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold
static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
{
char *f_org, *f_dest;
int f_org_len, f_dest_len;
size_t f_org_len, f_dest_len;
zend_long height, width, threshold;
gdImagePtr im_org, im_dest, im_tmp;
char *fn_org = NULL;

2
ext/gd/gd_ctx.c
View File

@ -78,7 +78,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
{
zval *imgind;
char *file = NULL;
int file_len = 0;
size_t file_len = 0;
zend_long quality, basefilter;
gdImagePtr im;
int argc = ZEND_NUM_ARGS();

8
ext/gettext/gettext.c
View File

@ -162,7 +162,7 @@ PHP_MINFO_FUNCTION(php_gettext)
PHP_NAMED_FUNCTION(zif_textdomain)
{
char *domain, *domain_name, *retval;
int domain_len;
size_t domain_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &domain, &domain_len) == FAILURE) {
return;
@ -187,7 +187,7 @@ PHP_NAMED_FUNCTION(zif_textdomain)
PHP_NAMED_FUNCTION(zif_gettext)
{
char *msgid, *msgstr;
int msgid_len;
size_t msgid_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &msgid, &msgid_len) == FAILURE) {
return;
@ -280,7 +280,7 @@ PHP_NAMED_FUNCTION(zif_bindtextdomain)
PHP_NAMED_FUNCTION(zif_ngettext)
{
char *msgid1, *msgid2, *msgstr;
int msgid1_len, msgid2_len;
size_t msgid1_len, msgid2_len;
zend_long count;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) {
@ -360,7 +360,7 @@ PHP_NAMED_FUNCTION(zif_dcngettext)
PHP_NAMED_FUNCTION(zif_bind_textdomain_codeset)
{
char *domain, *codeset, *retval = NULL;
int domain_len, codeset_len;
size_t domain_len, codeset_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) {
return;

15
ext/hash/hash.c
View File

@ -86,7 +86,7 @@ static struct mhash_bc_entry mhash_to_hash[MHASH_NUM_ALGOS] = {
/* Hash Registry Access */
PHP_HASH_API const php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len) /* {{{ */
PHP_HASH_API const php_hash_ops *php_hash_fetch_ops(const char *algo, size_t algo_len) /* {{{ */
{
char *lower = zend_str_tolower_dup(algo, algo_len);
php_hash_ops *ops = zend_hash_str_find_ptr(&php_hash_hashtable, lower, algo_len);
@ -211,7 +211,7 @@ static inline void php_hash_string_xor(unsigned char *out, const unsigned char *
}
}
static inline void php_hash_hmac_prep_key(unsigned char *K, const php_hash_ops *ops, void *context, const unsigned char *key, const int key_len) {
static inline void php_hash_hmac_prep_key(unsigned char *K, const php_hash_ops *ops, void *context, const unsigned char *key, const size_t key_len) {
memset(K, 0, ops->block_size);
if (key_len > ops->block_size) {
/* Reduce the key first */
@ -396,7 +396,7 @@ PHP_FUNCTION(hash_update)
zval *zhash;
php_hash_data *hash;
char *data;
int data_len;
size_t data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &zhash, &data, &data_len) == FAILURE) {
return;
@ -456,7 +456,7 @@ PHP_FUNCTION(hash_update_file)
php_stream_context *context;
php_stream *stream;
char *filename, buf[1024];
int filename_len, n;
size_t filename_len, n;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|r", &zhash, &filename, &filename_len, &zcontext) == FAILURE) {
return;
@ -602,8 +602,9 @@ PHP_FUNCTION(hash_pbkdf2)
zend_string *returnval;
char *algo, *salt, *pass = NULL;
unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2 = NULL;
zend_long loops, i, j, algo_len, pass_len, iterations, length = 0, digest_length = 0;
int salt_len = 0;
zend_long loops, i, j, iterations, digest_length = 0;
size_t algo_len, pass_len, length = 0;
size_t salt_len = 0;
zend_bool raw_output = 0;
const php_hash_ops *ops;
void *context;
@ -920,7 +921,7 @@ PHP_FUNCTION(mhash_keygen_s2k)
zend_long algorithm, l_bytes;
int bytes;
char *password, *salt;
int password_len, salt_len;
size_t password_len, salt_len;
char padded_salt[SALT_SIZE];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lssl", &algorithm, &password, &password_len, &salt, &salt_len, &l_bytes) == FAILURE) {

2
ext/hash/hash_md.c
View File

@ -106,7 +106,7 @@ PHP_HASH_API void make_digest(char *md5str, unsigned char *digest)
PHP_NAMED_FUNCTION(php_if_md5)
{
char *arg;
int arg_len;
size_t arg_len;
zend_bool raw_output = 0;
char md5str[33];
PHP_MD5_CTX context;

2
ext/hash/hash_sha.c
View File

@ -89,7 +89,7 @@ PHP_HASH_API void make_sha1_digest(char *sha1str, unsigned char *digest)
PHP_FUNCTION(sha1)
{
char *arg;
int arg_len;
size_t arg_len;
zend_bool raw_output = 0;
char sha1str[41];
PHP_SHA1_CTX context;

16
ext/iconv/iconv.c
View File

@ -2034,7 +2034,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset,
PHP_FUNCTION(iconv_strlen)
{
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_string *str;
php_iconv_err_t err;
@ -2066,7 +2066,7 @@ PHP_FUNCTION(iconv_strlen)
PHP_FUNCTION(iconv_substr)
{
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_string *str;
zend_long offset, length = 0;
@ -2105,7 +2105,7 @@ PHP_FUNCTION(iconv_substr)
PHP_FUNCTION(iconv_strpos)
{
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_string *haystk;
zend_string *ndl;
zend_long offset = 0;
@ -2151,7 +2151,7 @@ PHP_FUNCTION(iconv_strpos)
PHP_FUNCTION(iconv_strrpos)
{
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_string *haystk;
zend_string *ndl;
@ -2304,7 +2304,7 @@ PHP_FUNCTION(iconv_mime_decode)
{
zend_string *encoded_str;
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_long mode = 0;
smart_str retval = {0};
@ -2344,7 +2344,7 @@ PHP_FUNCTION(iconv_mime_decode_headers)
{
zend_string *encoded_str;
char *charset = get_internal_encoding(TSRMLS_C);
int charset_len = 0;
size_t charset_len = 0;
zend_long mode = 0;
char *enc_str_tmp;
size_t enc_str_len_tmp;
@ -2442,7 +2442,7 @@ PHP_NAMED_FUNCTION(php_if_iconv)
{
char *in_charset, *out_charset;
zend_string *in_buffer;
int in_charset_len = 0, out_charset_len = 0;
size_t in_charset_len = 0, out_charset_len = 0;
php_iconv_err_t err;
zend_string *out_buffer;
@ -2473,7 +2473,7 @@ PHP_NAMED_FUNCTION(php_if_iconv)
PHP_FUNCTION(iconv_set_encoding)
{
char *type, *charset;
int type_len, charset_len = 0, retval;
size_t type_len, charset_len = 0, retval;
zend_string *name;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &type, &type_len, &charset, &charset_len) == FAILURE)

6
ext/interbase/ibase_blobs.c
View File

@ -239,7 +239,7 @@ PHP_FUNCTION(ibase_blob_create)
PHP_FUNCTION(ibase_blob_open)
{
char *blob_id;
int blob_id_len;
size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
@ -406,7 +406,7 @@ PHP_FUNCTION(ibase_blob_cancel)
PHP_FUNCTION(ibase_blob_info)
{
char *blob_id;
int blob_id_len;
size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
@ -482,7 +482,7 @@ PHP_FUNCTION(ibase_blob_info)
PHP_FUNCTION(ibase_blob_echo)
{
char *blob_id;
int blob_id_len;
size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;

2
ext/interbase/ibase_query.c
View File

@ -1735,7 +1735,7 @@ PHP_FUNCTION(ibase_prepare)
zval *link_arg, *trans_arg;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
int query_len, trans_res_id = 0;
size_t query_len, trans_res_id = 0;
ibase_query *ib_query;
char *query;

4
ext/interbase/ibase_service.c
View File

@ -208,7 +208,7 @@ PHP_FUNCTION(ibase_delete_user)
Connect to the service manager */
PHP_FUNCTION(ibase_service_attach)
{
int hlen, ulen, plen, spb_len;
size_t hlen, ulen, plen, spb_len;
ibase_service *svm;
char buf[128], *host, *user, *pass, *loc;
isc_svc_handle handle = NULL;
@ -425,7 +425,7 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
*/
zval *res;
char *db, *bk, buf[200];
int dblen, bklen, spb_len;
size_t dblen, bklen, spb_len;
long opts = 0;
zend_bool verbose = 0;
ibase_service *svm;

4
ext/interbase/interbase.c
View File

@ -464,7 +464,7 @@ ZEND_GET_MODULE(ibase)
#endif
/* True globals, no need for thread safety */
int le_link, le_plink, le_trans;
size_t le_link, le_plink, le_trans;
/* }}} */
@ -1425,7 +1425,7 @@ PHP_FUNCTION(ibase_gen_id)
{
zval *link = NULL;
char query[128], *generator;
int gen_len;
size_t gen_len;
long inc = 1;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;

4
ext/intl/breakiterator/breakiterator_methods.cpp
View File

@ -46,7 +46,7 @@ static void _breakiter_factory(const char *func_name,
{
BreakIterator *biter;
const char *locale_str = NULL;
int dummy;
size_t dummy;
char *msg;
UErrorCode status = UErrorCode();
intl_error_reset(NULL TSRMLS_CC);
@ -149,7 +149,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text)
U_CFUNC PHP_FUNCTION(breakiter_set_text)
{
char *text;
int text_len;
size_t text_len;
UText *ut = NULL;
zval *textzv;
BREAKITER_METHOD_INIT_VARS;

2
ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
View File

@ -33,7 +33,7 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
{
zval *object = getThis();
char *rules;
int rules_len;
size_t rules_len;
zend_bool compiled = 0;
UErrorCode status = U_ZERO_ERROR;
intl_error_reset(NULL TSRMLS_CC);

6
ext/intl/calendar/calendar_methods.cpp
View File

@ -51,7 +51,7 @@ U_CFUNC PHP_FUNCTION(intlcal_create_instance)
{
zval *zv_timezone = NULL;
const char *locale_str = NULL;
int dummy;
size_t dummy;
TimeZone *timeZone;
UErrorCode status = U_ZERO_ERROR;
intl_error_reset(NULL TSRMLS_CC);
@ -143,7 +143,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale)
UErrorCode status = U_ZERO_ERROR;
char *key,
*locale;
int key_len,
size_t key_len,
locale_len;
zend_bool commonly_used;
intl_error_reset(NULL TSRMLS_CC);
@ -1144,7 +1144,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
zv_timestamp;
php_date_obj *datetime;
char *locale_str = NULL;
int locale_str_len;
size_t locale_str_len;
TimeZone *timeZone;
UErrorCode status = U_ZERO_ERROR;
Calendar *cal;

2
ext/intl/calendar/gregoriancalendar_methods.cpp
View File

@ -42,7 +42,7 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
zval args_a[6] = {0},
*args = &args_a[0];
char *locale = NULL;
int locale_len;
size_t locale_len;
zend_long largs[6];
UErrorCode status = U_ZERO_ERROR;
int variant;

4
ext/intl/collator/collator_compare.c
View File

@ -33,8 +33,8 @@ PHP_FUNCTION( collator_compare )
{
char* str1 = NULL;
char* str2 = NULL;
int str1_len = 0;
int str2_len = 0;
size_t str1_len = 0;
size_t str2_len = 0;
UChar* ustr1 = NULL;
UChar* ustr2 = NULL;

2
ext/intl/collator/collator_create.c
View File

@ -28,7 +28,7 @@
static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
const char* locale;
int locale_len = 0;
size_t locale_len = 0;
zval* object;
Collator_object* co;

2
ext/intl/collator/collator_sort.c
View File

@ -536,7 +536,7 @@ PHP_FUNCTION( collator_asort )
PHP_FUNCTION( collator_get_sort_key )
{
char* str = NULL;
int str_len = 0;
size_t str_len = 0;
UChar* ustr = NULL;
int ustr_len = 0;
uint8_t* key = NULL;

8
ext/intl/converter/converter.c
View File

@ -562,9 +562,9 @@ ZEND_END_ARG_INFO();
static PHP_METHOD(UConverter, __construct) {
php_converter_object *objval = CONV_GET(getThis());
char *src = "utf-8";
int src_len = sizeof("utf-8") - 1;
size_t src_len = sizeof("utf-8") - 1;
char *dest = src;
int dest_len = src_len;
size_t dest_len = src_len;
intl_error_reset(NULL TSRMLS_CC);
@ -763,7 +763,7 @@ ZEND_END_ARG_INFO();
static PHP_METHOD(UConverter, convert) {
php_converter_object *objval = CONV_GET(getThis());
char *str, *dest;
int str_len, dest_len;
size_t str_len, dest_len;
zend_bool reverse = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b",
@ -924,7 +924,7 @@ ZEND_BEGIN_ARG_INFO_EX(php_converter_getaliases_arginfo, 0, ZEND_RETURN_VALUE, 0
ZEND_END_ARG_INFO();
static PHP_METHOD(UConverter, getAliases) {
char *name;
int name_len;
size_t name_len;
UErrorCode error = U_ZERO_ERROR;
uint16_t i, count;

2
ext/intl/dateformat/dateformat_attr.c
View File

@ -128,7 +128,7 @@ PHP_FUNCTION( datefmt_get_pattern )
PHP_FUNCTION( datefmt_set_pattern )
{
char* value = NULL;
int value_len = 0;
size_t value_len = 0;
int slength = 0;
UChar* svalue = NULL;
zend_bool is_pattern_localized =FALSE;

4
ext/intl/dateformat/dateformat_create.cpp
View File

@ -41,7 +41,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
zval *object;
const char *locale_str;
int locale_len = 0;
size_t locale_len = 0;
Locale locale;
zend_long date_type = 0;
zend_long time_type = 0;
@ -53,7 +53,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
TimeZone *timezone = NULL;
bool explicit_tz;
char* pattern_str = NULL;
int pattern_str_len = 0;
size_t pattern_str_len = 0;
UChar* svalue = NULL; /* UTF-16 pattern_str */
int slength = 0;
IntlDateFormatter_object* dfo;

2
ext/intl/dateformat/dateformat_format_object.cpp
View File

@ -63,7 +63,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
zval *object,
*format = NULL;
const char *locale_str = NULL;
int locale_len;
size_t locale_len;
bool pattern = false;
UDate date;
TimeZone *timeZone = NULL;

2
ext/intl/dateformat/dateformat_parse.c
View File

@ -128,7 +128,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex
PHP_FUNCTION(datefmt_parse)
{
char* text_to_parse = NULL;
int32_t text_len =0;
size_t text_len =0;
zval* z_parse_pos = NULL;
int32_t parse_pos = -1;

2
ext/intl/formatter/formatter_attr.c
View File

@ -299,7 +299,7 @@ PHP_FUNCTION( numfmt_set_symbol )
{
zend_long symbol;
char* value = NULL;
int value_len = 0;
size_t value_len = 0;
UChar* svalue = 0;
int slength = 0;
FORMATTER_METHOD_INIT_VARS;

2
ext/intl/formatter/formatter_format.c
View File

@ -141,7 +141,7 @@ PHP_FUNCTION( numfmt_format_currency )
UChar* formatted = format_buf;
int formatted_len = USIZE(format_buf);
char* currency = NULL;
int currency_len = 0;
size_t currency_len = 0;
UChar* scurrency = NULL;
int scurrency_len = 0;
FORMATTER_METHOD_INIT_VARS;

2
ext/intl/formatter/formatter_main.c
View File

@ -29,7 +29,7 @@ static void numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
const char* locale;
char* pattern = NULL;
int locale_len = 0, pattern_len = 0;
size_t locale_len = 0, pattern_len = 0;
zend_long style;
UChar* spattern = NULL;
int spattern_len = 0;

4
ext/intl/formatter/formatter_parse.c
View File

@ -40,7 +40,7 @@ PHP_FUNCTION( numfmt_parse )
UChar* sstr = NULL;
int sstr_len = 0;
char* str = NULL;
int str_len;
size_t str_len;
int32_t val32, position = 0;
int64_t val64;
double val_double;
@ -132,7 +132,7 @@ PHP_FUNCTION( numfmt_parse_currency )
char *currency_str = NULL;
int currency_len = 0;
char *str;
int str_len;
size_t str_len;
int32_t* position_p = NULL;
int32_t position = 0;
zval *zcurrency, *zposition = NULL;

2
ext/intl/grapheme/grapheme_string.c
View File

@ -50,7 +50,7 @@ void grapheme_register_constants( INIT_FUNC_ARGS )
}
/* }}} */
/* {{{ proto int grapheme_strlen(string str)
/* {{{ proto size_t grapheme_strlen(string str)
Get number of graphemes in a string */
PHP_FUNCTION(grapheme_strlen)
{

14
ext/intl/locale/locale_methods.c
View File

@ -373,7 +373,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
{
const char* loc_name = NULL;
int loc_name_len = 0;
size_t loc_name_len = 0;
char* tag_value = NULL;
char* empty_result = "";
@ -471,10 +471,10 @@ PHP_FUNCTION(locale_get_primary_language )
static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
{
const char* loc_name = NULL;
int loc_name_len = 0;
size_t loc_name_len = 0;
const char* disp_loc_name = NULL;
int disp_loc_name_len = 0;
size_t disp_loc_name_len = 0;
int free_loc_name = 0;
UChar* disp_name = NULL;
@ -1238,9 +1238,9 @@ static int strToMatch(const char* str ,char *retstr)
PHP_FUNCTION(locale_filter_matches)
{
char* lang_tag = NULL;
int lang_tag_len = 0;
size_t lang_tag_len = 0;
const char* loc_range = NULL;
int loc_range_len = 0;
size_t loc_range_len = 0;
int result = 0;
char* token = 0;
@ -1529,7 +1529,7 @@ static char* lookup_loc_range(const char* loc_range, HashTable* hash_arr, int ca
PHP_FUNCTION(locale_lookup)
{
char* fallback_loc = NULL;
int fallback_loc_len = 0;
size_t fallback_loc_len = 0;
const char* loc_range = NULL;
int loc_range_len = 0;
@ -1582,7 +1582,7 @@ PHP_FUNCTION(locale_accept_from_http)
{
UEnumeration *available;
char *http_accept = NULL;
int http_accept_len;
size_t http_accept_len;
UErrorCode status = 0;
int len;
char resultLocale[INTL_MAX_LOCALE_LEN+1];

2
ext/intl/msgformat/msgformat.c
View File

@ -30,7 +30,7 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
const char* locale;
char* pattern;
int locale_len = 0, pattern_len = 0;
size_t locale_len = 0, pattern_len = 0;
UChar* spattern = NULL;
int spattern_len = 0;
zval* object;

2
ext/intl/msgformat/msgformat_attr.c
View File

@ -62,7 +62,7 @@ PHP_FUNCTION( msgfmt_get_pattern )
PHP_FUNCTION( msgfmt_set_pattern )
{
char* value = NULL;
int value_len = 0;
size_t value_len = 0;
int spattern_len = 0;
UChar* spattern = NULL;
MSG_FORMAT_METHOD_INIT_VARS;

4
ext/intl/msgformat/msgformat_format.c
View File

@ -101,9 +101,9 @@ PHP_FUNCTION( msgfmt_format_message )
UChar *spattern = NULL;
int spattern_len = 0;
char *pattern = NULL;
int pattern_len = 0;
size_t pattern_len = 0;
const char *slocale = NULL;
int slocale_len = 0;
size_t slocale_len = 0;
MessageFormatter_object mf = {0};
MessageFormatter_object *mfo = &mf;

8
ext/intl/msgformat/msgformat_parse.c
View File

@ -28,7 +28,7 @@
#include "intl_convert.h"
/* {{{ */
static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, int src_len, zval *return_value TSRMLS_DC)
static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, size_t src_len, zval *return_value TSRMLS_DC)
{
zval *fargs;
int count = 0;
@ -61,7 +61,7 @@ static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, int src_
PHP_FUNCTION( msgfmt_parse )
{
char *source;
int source_len;
size_t source_len;
MSG_FORMAT_METHOD_INIT_VARS;
@ -92,9 +92,9 @@ PHP_FUNCTION( msgfmt_parse_message )
UChar *spattern = NULL;
int spattern_len = 0;
char *pattern = NULL;
int pattern_len = 0;
size_t pattern_len = 0;
const char *slocale = NULL;
int slocale_len = 0;
size_t slocale_len = 0;
char *source = NULL;
int src_len = 0;
MessageFormatter_object mf = {0};

2
ext/intl/normalizer/normalizer_normalize.c
View File

@ -35,7 +35,7 @@ PHP_FUNCTION( normalizer_normalize )
char* input = NULL;
/* form is optional, defaults to FORM_C */
zend_long form = NORMALIZER_DEFAULT;
int input_len = 0;
size_t input_len = 0;
UChar* uinput = NULL;
int uinput_len = 0;

4
ext/intl/resourcebundle/resourcebundle_class.c
View File

@ -77,9 +77,9 @@ static zend_object *ResourceBundle_object_create( zend_class_entry *ce TSRMLS_DC
static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
const char *bundlename;
int bundlename_len = 0;
size_t bundlename_len = 0;
const char *locale;
int locale_len = 0;
size_t locale_len = 0;
zend_bool fallback = 1;
zval *object = return_value;

6
ext/intl/spoofchecker/spoofchecker_main.c
View File

@ -28,7 +28,7 @@ PHP_METHOD(Spoofchecker, isSuspicious)
{
int ret;
char *text;
int text_len;
size_t text_len;
zval *error_code = NULL;
SPOOFCHECKER_METHOD_INIT_VARS;
@ -60,7 +60,7 @@ PHP_METHOD(Spoofchecker, areConfusable)
{
int ret;
char *s1, *s2;
int s1_len, s2_len;
size_t s1_len, s2_len;
zval *error_code = NULL;
SPOOFCHECKER_METHOD_INIT_VARS;
@ -92,7 +92,7 @@ PHP_METHOD(Spoofchecker, areConfusable)
PHP_METHOD(Spoofchecker, setAllowedLocales)
{
char *locales;
int locales_len;
size_t locales_len;
SPOOFCHECKER_METHOD_INIT_VARS;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &locales, &locales_len)) {

14
ext/intl/timezone/timezone_methods.cpp
View File

@ -47,7 +47,7 @@ U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
U_CFUNC PHP_FUNCTION(intltz_create_time_zone)
{
char *str_id;
int str_id_len;
size_t str_id_len;
intl_error_reset(NULL TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@ -209,7 +209,7 @@ double_offset:
U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids)
{
char *str_id;
int str_id_len;
size_t str_id_len;
intl_error_reset(NULL TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@ -237,7 +237,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
zend_long zoneType,
offset_arg;
char *region = NULL;
int region_len = 0;
size_t region_len = 0;
int32_t offset,
*offsetp = NULL;
int arg3isnull = 0;
@ -291,7 +291,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
{
char *str_id;
int str_id_len;
size_t str_id_len;
zval *is_systemid = NULL;
intl_error_reset(NULL TSRMLS_CC);
@ -335,7 +335,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
U_CFUNC PHP_FUNCTION(intltz_get_region)
{
char *str_id;
int str_id_len;
size_t str_id_len;
char outbuf[3];
intl_error_reset(NULL TSRMLS_CC);
@ -382,7 +382,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version)
U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
{
char *str_id;
int str_id_len;
size_t str_id_len;
zend_long index;
intl_error_reset(NULL TSRMLS_CC);
@ -547,7 +547,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
zend_bool daylight = 0;
zend_long display_type = TimeZone::LONG;
const char *locale_str = NULL;
int dummy = 0;
size_t dummy = 0;
TIMEZONE_METHOD_INIT_VARS;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),

4
ext/intl/transliterator/transliterator_methods.c
View File

@ -136,7 +136,7 @@ PHP_FUNCTION( transliterator_create )
PHP_FUNCTION( transliterator_create_from_rules )
{
char *str_rules;
int str_rules_len;
size_t str_rules_len;
UChar *ustr_rules = NULL;
int32_t ustr_rules_len = 0;
zend_long direction = TRANSLITERATOR_FORWARD;
@ -303,7 +303,7 @@ PHP_FUNCTION( transliterator_transliterate )
char *str;
UChar *ustr = NULL,
*uresult = NULL;
int str_len;
size_t str_len;
int32_t ustr_len = 0,
capacity,
uresult_len;

4
ext/json/json.c
View File

@ -664,9 +664,9 @@ again:
}
/* }}} */
PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len, int options, zend_long depth TSRMLS_DC) /* {{{ */
PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, size_t options, zend_long depth TSRMLS_DC) /* {{{ */
{
int utf16_len;
size_t utf16_len;
unsigned short *utf16;
JSON_parser jp;

17
ext/ldap/ldap.c
View File

@ -294,11 +294,11 @@ PHP_MINFO_FUNCTION(ldap)
PHP_FUNCTION(ldap_connect)
{
char *host = NULL;
int hostlen;
size_t hostlen;
zend_long port = 389; /* Default port */
#ifdef HAVE_ORALDAP
char *wallet = NULL, *walletpasswd = NULL;
int walletlen = 0, walletpasswdlen = 0;
size_t walletlen = 0, walletpasswdlen = 0;
zend_long authmode = GSLC_SSL_NO_AUTH;
int ssl=0;
#endif
@ -394,7 +394,7 @@ PHP_FUNCTION(ldap_bind)
{
zval *link;
char *ldap_bind_dn = NULL, *ldap_bind_pw = NULL;
int ldap_bind_dnlen, ldap_bind_pwlen;
size_t ldap_bind_dnlen, ldap_bind_pwlen;
ldap_linkdata *ld;
int rc;
@ -1247,7 +1247,7 @@ PHP_FUNCTION(ldap_explode_dn)
PHP_FUNCTION(ldap_dn2ufn)
{
char *dn, *ufn;
int dn_len;
size_t dn_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &dn, &dn_len) != SUCCESS) {
return;
@ -1500,7 +1500,7 @@ PHP_FUNCTION(ldap_modify_batch)
zval *attrib, *modtype, *vals;
zval *fetched;
char *dn;
int dn_len;
size_t dn_len;
int i, j, k;
int num_mods, num_modprops, num_modvals;
LDAPMod **ldap_mods;
@ -1878,7 +1878,7 @@ PHP_FUNCTION(ldap_sort)
zval *link, *result;
ldap_linkdata *ld;
char *sortfilter;
int sflen;
size_t sflen;
zend_resource *le;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrs", &link, &result, &sortfilter, &sflen) != SUCCESS) {
@ -2520,7 +2520,8 @@ static void php_ldap_escape_map_set_chars(zend_bool *map, const char *chars, con
PHP_FUNCTION(ldap_escape)
{
char *value, *ignores, *result;
int valuelen = 0, ignoreslen = 0, i;
size_t valuelen = 0, ignoreslen = 0;
int i;
size_t resultlen;
zend_long flags = 0;
zend_bool map[256] = {0}, havecharlist = 0;
@ -2617,7 +2618,7 @@ PHP_FUNCTION(ldap_control_paged_result)
zend_bool iscritical;
zval *link;
char *cookie = NULL;
int cookie_len = 0;
size_t cookie_len = 0;
struct berval lcookie = { 0, NULL };
ldap_linkdata *ld;
LDAP *ldap;

33
ext/mbstring/mbstring.c
View File

@ -1789,7 +1789,7 @@ PHP_FUNCTION(mb_internal_encoding)
PHP_FUNCTION(mb_http_input)
{
char *typ = NULL;
int typ_len;
size_t typ_len;
int retname;
char *list, *temp;
const mbfl_encoding *result = NULL;
@ -2059,7 +2059,7 @@ PHP_FUNCTION(mb_parse_str)
{
zval *track_vars_array = NULL;
char *encstr = NULL;
int encstr_len;
size_t encstr_len;
php_mb_encoding_handler_info_t info;
const mbfl_encoding *detected;
@ -2108,7 +2108,7 @@ PHP_FUNCTION(mb_parse_str)
PHP_FUNCTION(mb_output_handler)
{
char *arg_string;
int arg_string_len;
size_t arg_string_len;
zend_long arg_status;
mbfl_string string, result;
const char *charset;
@ -2412,7 +2412,7 @@ PHP_FUNCTION(mb_stripos)
zend_long offset;
mbfl_string haystack, needle;
const char *from_encoding = MBSTRG(current_internal_encoding)->mime_name;
int from_encoding_len;
size_t from_encoding_len;
n = -1;
offset = 0;
@ -2441,7 +2441,7 @@ PHP_FUNCTION(mb_strripos)
zend_long offset;
mbfl_string haystack, needle;
const char *from_encoding = MBSTRG(current_internal_encoding)->mime_name;
int from_encoding_len;
size_t from_encoding_len;
n = -1;
offset = 0;
@ -2833,7 +2833,7 @@ PHP_FUNCTION(mb_strcut)
size_t argc = ZEND_NUM_ARGS();
char *encoding;
zend_long from, len;
int encoding_len;
size_t encoding_len;
zval *z_len = NULL;
mbfl_string string, result, *ret;
@ -2936,7 +2936,7 @@ PHP_FUNCTION(mb_strimwidth)
{
char *str, *trimmarker, *encoding;
zend_long from, width;
int str_len, trimmarker_len, encoding_len;
size_t str_len, trimmarker_len, encoding_len;
mbfl_string string, result, marker, *ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|ss", &str, &str_len, &from, &width, &trimmarker, &trimmarker_len, &encoding, &encoding_len) == FAILURE) {
@ -3081,7 +3081,7 @@ MBSTRING_API char * php_mb_convert_encoding(const char *input, size_t length, co
PHP_FUNCTION(mb_convert_encoding)
{
char *arg_str, *arg_new;
int str_len, new_len;
size_t str_len, new_len;
zval *arg_old;
size_t size, l, n;
char *_from_encodings = NULL, *ret, *s_free = NULL;
@ -3548,7 +3548,8 @@ PHP_FUNCTION(mb_convert_variables)
const mbfl_encoding *from_encoding, *to_encoding;
mbfl_encoding_detector *identd;
mbfl_buffer_converter *convd;
int n, to_enc_len, argc, stack_level, stack_max;
int n, argc, stack_level, stack_max;
size_t to_enc_len;
size_t elistsz;
const mbfl_encoding **elist;
char *to_enc;
@ -4042,14 +4043,14 @@ PHP_FUNCTION(mb_send_mail)
{
int n;
char *to = NULL;
int to_len;
size_t to_len;
char *message = NULL;
int message_len;
size_t message_len;
char *headers = NULL;
int headers_len;
size_t headers_len;
char *subject = NULL;
zend_string *extra_cmd = NULL;
int subject_len;
size_t subject_len;
int i;
char *to_r = NULL;
char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
@ -4328,7 +4329,7 @@ PHP_FUNCTION(mb_send_mail)
PHP_FUNCTION(mb_get_info)
{
char *typ = NULL;
int typ_len;
size_t typ_len;
size_t n;
char *name;
const struct mb_overload_def *over_func;
@ -4506,9 +4507,9 @@ PHP_FUNCTION(mb_get_info)
PHP_FUNCTION(mb_check_encoding)
{
char *var = NULL;
int var_len;
size_t var_len;
char *enc = NULL;
int enc_len;
size_t enc_len;
mbfl_buffer_converter *convd;
const mbfl_encoding *encoding = MBSTRG(current_internal_encoding);
mbfl_string string, result, *ret = NULL;

24
ext/mbstring/php_mbregex.c
View File

@ -689,7 +689,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
{
zval *arg_pattern, *array;
char *string;
int string_len;
size_t string_len;
php_mb_regex_t *re;
OnigRegion *regs = NULL;
int i, match_len, beg, end;
@ -788,16 +788,16 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
zval *arg_pattern_zval;
char *arg_pattern;
int arg_pattern_len;
size_t arg_pattern_len;
char *replace;
int replace_len;
size_t replace_len;
zend_fcall_info arg_replace_fci;
zend_fcall_info_cache arg_replace_fci_cache;
char *string;
int string_len;
size_t string_len;
char *p;
php_mb_regex_t *re;
@ -826,7 +826,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
eval = 0;
{
char *option_str = NULL;
int option_str_len = 0;
size_t option_str_len = 0;
if (!is_callable) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zss|s",
@ -1052,12 +1052,12 @@ PHP_FUNCTION(mb_ereg_replace_callback)
PHP_FUNCTION(mb_split)
{
char *arg_pattern;
int arg_pattern_len;
size_t arg_pattern_len;
php_mb_regex_t *re;
OnigRegion *regs = NULL;
char *string;
OnigUChar *pos, *chunk_pos;
int string_len;
size_t string_len;
int n, err;
zend_long count = -1;
@ -1131,10 +1131,10 @@ PHP_FUNCTION(mb_split)
PHP_FUNCTION(mb_ereg_match)
{
char *arg_pattern;
int arg_pattern_len;
size_t arg_pattern_len;
char *string;
int string_len;
size_t string_len;
php_mb_regex_t *re;
OnigSyntaxType *syntax;
@ -1143,7 +1143,7 @@ PHP_FUNCTION(mb_ereg_match)
{
char *option_str = NULL;
int option_str_len = 0;
size_t option_str_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s",
&arg_pattern, &arg_pattern_len, &string, &string_len,
@ -1180,7 +1180,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
size_t argc = ZEND_NUM_ARGS();
char *arg_pattern, *arg_options;
int arg_pattern_len, arg_options_len;
size_t arg_pattern_len, arg_options_len;
int n, i, err, pos, len, beg, end;
OnigOptionType option;
OnigUChar *str;
@ -1435,7 +1435,7 @@ PHP_FUNCTION(mb_regex_set_options)
OnigOptionType opt;
OnigSyntaxType *syntax;
char *string = NULL;
int string_len;
size_t string_len;
char buf[16];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s",

18
ext/mcrypt/mcrypt.c
View File

@ -347,7 +347,7 @@ typedef enum {
char *dir = NULL; \
int dir_len; \
char *module; \
int module_len; \
size_t module_len; \
if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \
"s|s", &module, &module_len, &dir, &dir_len) == FAILURE) { \
return; \
@ -508,8 +508,8 @@ PHP_FUNCTION(mcrypt_module_open)
{
char *cipher, *cipher_dir;
char *mode, *mode_dir;
int cipher_len, cipher_dir_len;
int mode_len, mode_dir_len;
size_t cipher_len, cipher_dir_len;
size_t mode_len, mode_dir_len;
MCRYPT td;
php_mcrypt *pm;
@ -543,7 +543,7 @@ PHP_FUNCTION(mcrypt_module_open)
PHP_FUNCTION(mcrypt_generic_init)
{
char *key, *iv;
int key_len, iv_len;
size_t key_len, iv_len;
zval *mcryptind;
unsigned char *key_s, *iv_s;
int max_key_size, key_size, iv_size;
@ -616,7 +616,7 @@ PHP_FUNCTION(mcrypt_generic)
{
zval *mcryptind;
char *data;
int data_len;
size_t data_len;
php_mcrypt *pm;
char* data_s;
int block_size, data_size;
@ -661,7 +661,7 @@ PHP_FUNCTION(mdecrypt_generic)
{
zval *mcryptind;
char *data;
int data_len;
size_t data_len;
php_mcrypt *pm;
char* data_s;
int block_size, data_size;
@ -949,7 +949,7 @@ PHP_FUNCTION(mcrypt_list_algorithms)
{
char **modules;
char *lib_dir = MCG(algorithms_dir);
int lib_dir_len;
size_t lib_dir_len;
int i, count;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s",
@ -976,7 +976,7 @@ PHP_FUNCTION(mcrypt_list_modes)
{
char **modules;
char *lib_dir = MCG(modes_dir);
int lib_dir_len;
size_t lib_dir_len;
int i, count;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s",
@ -1238,7 +1238,7 @@ static int php_mcrypt_ensure_valid_iv(MCRYPT td, const char *iv, int iv_size TSR
}
/* }}} */
static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len, const char *data, int data_len, char *mode, const char *iv, int iv_len, int dencrypt, zval* return_value TSRMLS_DC) /* {{{ */
static void php_mcrypt_do_crypt(char* cipher, const char *key, int key_len, const char *data, int data_len, char *mode, const char *iv, size_t iv_len, size_t dencrypt, zval* return_value TSRMLS_DC) /* {{{ */
{
char *cipher_dir_string;
char *module_dir_string;

16
ext/mysql/php_mysql.c
View File

@ -725,7 +725,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
char *user = NULL, *passwd = NULL;
char *host_and_port = NULL, *socket = NULL;
char *tmp = NULL, *host = NULL;
int user_len = 0, passwd_len = 0, host_len = 0;
size_t user_len = 0, passwd_len = 0, host_len = 0;
int port = MYSQL_PORT;
zend_long client_flags = 0;
php_mysql_conn *mysql = NULL;
@ -1145,7 +1145,7 @@ PHP_FUNCTION(mysql_close)
PHP_FUNCTION(mysql_select_db)
{
char *db;
int db_len;
size_t db_len;
php_mysql_conn *mysql;
zval *mysql_link = NULL;
@ -1404,7 +1404,7 @@ PHP_FUNCTION(mysql_set_charset)
PHP_FUNCTION(mysql_create_db)
{
char *db;
int db_len;
size_t db_len;
php_mysql_conn *mysql;
zval *mysql_link = NULL;
@ -1435,7 +1435,7 @@ PHP_FUNCTION(mysql_create_db)
PHP_FUNCTION(mysql_drop_db)
{
char *db;
int db_len;
size_t db_len;
php_mysql_conn *mysql;
zval *mysql_link = NULL;
@ -1657,7 +1657,7 @@ PHP_FUNCTION(mysql_list_dbs)
PHP_FUNCTION(mysql_list_tables)
{
char *db;
int db_len;
size_t db_len;
php_mysql_conn *mysql;
zval *mysql_link = NULL;
MYSQL_RES *mysql_result;
@ -1694,7 +1694,7 @@ PHP_FUNCTION(mysql_list_tables)
PHP_FUNCTION(mysql_list_fields)
{
char *db, *table;
int db_len, table_len;
size_t db_len, table_len;
zval *mysql_link = NULL;
php_mysql_conn *mysql;
MYSQL_RES *mysql_result;
@ -1846,7 +1846,7 @@ PHP_FUNCTION(mysql_affected_rows)
PHP_FUNCTION(mysql_escape_string)
{
char *str;
int str_len;
size_t str_len;
zend_string *escaped_str;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
@ -1870,7 +1870,7 @@ PHP_FUNCTION(mysql_escape_string)
PHP_FUNCTION(mysql_real_escape_string)
{
char *str;
int str_len;
size_t str_len;
zend_string *new_str;
php_mysql_conn *mysql;
zval *mysql_link = NULL;

2
ext/mysqli/mysqli.c
View File

@ -1047,7 +1047,7 @@ PHP_FUNCTION(mysqli_stmt_construct)
MY_STMT *stmt;
MYSQLI_RESOURCE *mysqli_resource;
char *statement;
int statement_len;
size_t statement_len;
switch (ZEND_NUM_ARGS())
{

16
ext/mysqli/mysqli_api.c
View File

@ -37,7 +37,7 @@
#if !defined(MYSQLI_USE_MYSQLND)
/* {{{ mysqli_tx_cor_options_to_string */
static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const unsigned int mode)
static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const unsigned size_t mode)
{
if (mode & TRANS_COR_AND_CHAIN && !(mode & TRANS_COR_AND_NO_CHAIN)) {
if (str->s && str->s->len) {
@ -623,7 +623,7 @@ PHP_FUNCTION(mysqli_change_user)
MY_MYSQL *mysql;
zval *mysql_link = NULL;
char *user, *password, *dbname;
int user_len, password_len, dbname_len;
size_t user_len, password_len, dbname_len;
zend_ulong rc;
#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
const CHARSET_INFO * old_charset;
@ -754,7 +754,7 @@ PHP_FUNCTION(mysqli_commit)
zval *mysql_link;
zend_long flags = TRANS_COR_NO_OPT;
char * name = NULL;
int name_len = 0;
size_t name_len = 0;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
return;
@ -805,7 +805,7 @@ PHP_FUNCTION(mysqli_data_seek)
PHP_FUNCTION(mysqli_debug)
{
char *debug;
int debug_len;
size_t debug_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &debug, &debug_len) == FAILURE) {
return;
@ -1836,7 +1836,7 @@ PHP_FUNCTION(mysqli_prepare)
MY_MYSQL *mysql;
MY_STMT *stmt;
char *query = NULL;
int query_len;
size_t query_len;
zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
@ -1978,7 +1978,7 @@ PHP_FUNCTION(mysqli_rollback)
zval *mysql_link;
zend_long flags = TRANS_COR_NO_OPT;
char * name = NULL;
int name_len = 0;
size_t name_len = 0;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
return;
@ -2004,7 +2004,7 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
zval *mysql_stmt;
char *data;
zend_long param_nr;
int data_len;
size_t data_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &mysql_stmt, mysqli_stmt_class_entry, &param_nr, &data, &data_len) == FAILURE) {
return;
@ -2197,7 +2197,7 @@ PHP_FUNCTION(mysqli_select_db)
MY_MYSQL *mysql;
zval *mysql_link;
char *dbname;
int dbname_len;
size_t dbname_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) {
return;

10
ext/mysqli/mysqli_nonapi.c
View File

@ -62,7 +62,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
size_t hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
zend_bool persistent = FALSE;
zend_long port = 0, flags = 0;
zend_string *hash_key = NULL;
@ -503,7 +503,7 @@ PHP_FUNCTION(mysqli_multi_query)
MY_MYSQL *mysql;
zval *mysql_link;
char *query = NULL;
int query_len;
size_t query_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
return;
@ -1078,7 +1078,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
zval *mysql_link;
zend_long flags = TRANS_START_NO_OPT;
char * name = NULL;
int name_len = -1;
size_t name_len = -1;
zend_bool err = FALSE;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
@ -1131,7 +1131,7 @@ PHP_FUNCTION(mysqli_savepoint)
MY_MYSQL *mysql;
zval *mysql_link;
char * name = NULL;
int name_len = -1;
size_t name_len = -1;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) {
return;
@ -1160,7 +1160,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
MY_MYSQL *mysql;
zval *mysql_link;
char * name = NULL;
int name_len = -1;
size_t name_len = -1;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) {
return;

4
ext/odbc/birdstep.c
View File

@ -287,7 +287,7 @@ static void birdstep_del_result(HashTable *list,int ind)
PHP_FUNCTION(birdstep_connect)
{
char *serv, *user, *pass;
int serv_len, user_len, pass_len;
size_t serv_len, user_len, pass_len;
RETCODE stat;
HDBC hdbc;
VConn *new;
@ -347,7 +347,7 @@ PHP_FUNCTION(birdstep_exec)
{
char *query;
zend_long ind;
int query_len, indx;
size_t query_len, indx;
VConn *conn;
Vresult *res;
RETCODE stat;

16
ext/odbc/php_odbc.c
View File

@ -1147,7 +1147,7 @@ PHP_FUNCTION(odbc_prepare)
{
zval *pv_conn;
char *query;
int query_len;
size_t query_len;
odbc_result *result = NULL;
odbc_connection *conn;
RETCODE rc;
@ -2205,7 +2205,7 @@ PHP_FUNCTION(odbc_result_all)
RETCODE rc;
zval *pv_res;
char *pv_format = NULL;
int i, pv_format_len = 0;
size_t i, pv_format_len = 0;
SQLSMALLINT sql_c_type;
#ifdef HAVE_SQL_EXTENDED_FETCH
SQLULEN crow;
@ -2500,7 +2500,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{
char *db, *uid, *pwd;
int db_len, uid_len, pwd_len;
size_t db_len, uid_len, pwd_len;
zend_long pv_opt = SQL_CUR_DEFAULT;
odbc_connection *db_conn;
char *hashed_details;
@ -2868,7 +2868,7 @@ PHP_FUNCTION(odbc_field_scale)
PHP_FUNCTION(odbc_field_num)
{
char *fname;
int i, field_ind, fname_len;
size_t i, field_ind, fname_len;
odbc_result *result;
zval *pv_res;
@ -3069,7 +3069,7 @@ PHP_FUNCTION(odbc_tables)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *table = NULL, *type = NULL;
int cat_len = 0, schema_len = 0, table_len = 0, type_len = 0;
size_t cat_len = 0, schema_len = 0, table_len = 0, type_len = 0;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
@ -3270,7 +3270,7 @@ PHP_FUNCTION(odbc_foreignkeys)
odbc_result *result = NULL;
odbc_connection *conn;
char *pcat = NULL, *pschema, *ptable, *fcat, *fschema, *ftable;
int pcat_len = 0, pschema_len, ptable_len, fcat_len, fschema_len, ftable_len;
size_t pcat_len = 0, pschema_len, ptable_len, fcat_len, fschema_len, ftable_len;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!sssss", &pv_conn, &pcat, &pcat_len, &pschema, &pschema_len,
@ -3467,7 +3467,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *proc = NULL, *col = NULL;
int cat_len = 0, schema_len = 0, proc_len = 0, col_len = 0;
size_t cat_len = 0, schema_len = 0, proc_len = 0, col_len = 0;
RETCODE rc;
if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 5) {
@ -3601,7 +3601,7 @@ PHP_FUNCTION(odbc_specialcolumns)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *name = NULL;
int cat_len = 0, schema_len, name_len;
size_t cat_len = 0, schema_len, name_len;
SQLUSMALLINT type, scope, nullable;
RETCODE rc;

6
ext/opcache/zend_accelerator_module.c
View File

@ -674,7 +674,7 @@ static ZEND_FUNCTION(opcache_reset)
static ZEND_FUNCTION(opcache_invalidate)
{
char *script_name;
int script_name_len;
size_t script_name_len;
zend_bool force = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &script_name, &script_name_len, &force) == FAILURE) {
@ -695,7 +695,7 @@ static ZEND_FUNCTION(opcache_invalidate)
static ZEND_FUNCTION(opcache_compile_file)
{
char *script_name;
int script_name_len;
size_t script_name_len;
zend_file_handle handle;
zend_op_array *op_array = NULL;
zend_execute_data *orig_execute_data = NULL;
@ -738,7 +738,7 @@ static ZEND_FUNCTION(opcache_compile_file)
static ZEND_FUNCTION(opcache_is_script_cached)
{
char *script_name;
int script_name_len;
size_t script_name_len;
if (!validate_api_restriction(TSRMLS_C)) {
RETURN_FALSE;

80
ext/openssl/openssl.c
View File

@ -1408,7 +1408,7 @@ PHP_FUNCTION(openssl_x509_export_to_file)
BIO * bio_out;
zend_resource *certresource;
char * filename;
int filename_len;
size_t filename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zp|b", &zcert, &filename, &filename_len, &notext) == FAILURE) {
return;
@ -1448,7 +1448,7 @@ PHP_FUNCTION(openssl_x509_export_to_file)
outputting results to var */
PHP_FUNCTION(openssl_spki_new)
{
int challenge_len;
size_t challenge_len;
char * challenge = NULL, * spkstr = NULL;
zend_string * s = NULL;
zend_resource *keyresource = NULL;
@ -1793,7 +1793,7 @@ PHP_FUNCTION(openssl_x509_fingerprint)
zend_resource *certresource;
zend_bool raw_output = 0;
char *method = "sha1";
int method_len;
size_t method_len;
zend_string *fingerprint;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|sb", &zcert, &method, &method_len, &raw_output) == FAILURE) {
@ -2139,7 +2139,7 @@ PHP_FUNCTION(openssl_x509_checkpurpose)
STACK_OF(X509) * untrustedchain = NULL;
zend_long purpose;
char * untrusted = NULL;
int untrusted_len = 0, ret;
size_t untrusted_len = 0, ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl|a!s", &zcert, &purpose, &zcainfo, &untrusted, &untrusted_len) == FAILURE) {
return;
@ -2353,9 +2353,9 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file)
PKCS12 * p12 = NULL;
char * filename;
char * friendly_name = NULL;
int filename_len;
size_t filename_len;
char * pass;
int pass_len;
size_t pass_len;
zval *zcert = NULL, *zpkey = NULL, *args = NULL;
EVP_PKEY *priv_key = NULL;
zend_resource *certresource, *keyresource;
@ -2438,7 +2438,7 @@ PHP_FUNCTION(openssl_pkcs12_export)
EVP_PKEY *priv_key = NULL;
zend_resource *certresource, *keyresource;
char * pass;
int pass_len;
size_t pass_len;
char * friendly_name = NULL;
zval * item;
STACK_OF(X509) *ca = NULL;
@ -2505,7 +2505,7 @@ PHP_FUNCTION(openssl_pkcs12_read)
{
zval *zout = NULL, zextracerts, zcert, zpkey;
char *pass, *zp12;
int pass_len, zp12_len;
size_t pass_len, zp12_len;
PKCS12 * p12 = NULL;
EVP_PKEY * pkey = NULL;
X509 * cert = NULL;
@ -2793,7 +2793,7 @@ PHP_FUNCTION(openssl_csr_export_to_file)
X509_REQ * csr;
zval * zcsr = NULL;
zend_bool notext = 1;
char * filename = NULL; int filename_len;
char * filename = NULL; size_t filename_len;
BIO * bio_out;
zend_resource *csr_resource;
@ -3587,7 +3587,7 @@ PHP_FUNCTION(openssl_pkey_export_to_file)
{
struct php_x509_request req;
zval * zpkey, * args = NULL;
char * passphrase = NULL; int passphrase_len = 0;
char * passphrase = NULL; size_t passphrase_len = 0;
char * filename = NULL; int filename_len = 0;
zend_resource *key_resource = NULL;
EVP_PKEY * key;
@ -3647,7 +3647,7 @@ PHP_FUNCTION(openssl_pkey_export)
{
struct php_x509_request req;
zval * zpkey, * args = NULL, *out;
char * passphrase = NULL; int passphrase_len = 0;
char * passphrase = NULL; size_t passphrase_len = 0;
zend_resource *key_resource = NULL;
EVP_PKEY * key;
BIO * bio_out = NULL;
@ -3869,8 +3869,8 @@ PHP_FUNCTION(openssl_pkey_get_details)
PHP_FUNCTION(openssl_pbkdf2)
{
zend_long key_length = 0, iterations = 0;
char *password; int password_len;
char *salt; int salt_len;
char *password; size_t password_len;
char *salt; size_t salt_len;
char *method; int method_len = 0;
zend_string *out_buffer;
@ -3926,10 +3926,10 @@ PHP_FUNCTION(openssl_pkcs7_verify)
PKCS7 * p7 = NULL;
BIO * in = NULL, * datain = NULL, * dataout = NULL;
zend_long flags = 0;
char * filename; int filename_len;
char * extracerts = NULL; int extracerts_len = 0;
char * signersfilename = NULL; int signersfilename_len = 0;
char * datafilename = NULL; int datafilename_len = 0;
char * filename; size_t filename_len;
char * extracerts = NULL; size_t extracerts_len = 0;
char * signersfilename = NULL; size_t signersfilename_len = 0;
char * datafilename = NULL; size_t datafilename_len = 0;
RETVAL_LONG(-1);
@ -4038,8 +4038,8 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
const EVP_CIPHER *cipher = NULL;
zend_long cipherid = PHP_OPENSSL_CIPHER_DEFAULT;
zend_string * strindex;
char * infilename = NULL; int infilename_len;
char * outfilename = NULL; int outfilename_len;
char * infilename = NULL; size_t infilename_len;
char * outfilename = NULL; size_t outfilename_len;
RETVAL_FALSE;
@ -4163,9 +4163,9 @@ PHP_FUNCTION(openssl_pkcs7_sign)
STACK_OF(X509) *others = NULL;
zend_resource *certresource = NULL, *keyresource = NULL;
zend_string * strindex;
char * infilename; int infilename_len;
char * outfilename; int outfilename_len;
char * extracertsfilename = NULL; int extracertsfilename_len;
char * infilename; size_t infilename_len;
char * outfilename; size_t outfilename_len;
char * extracertsfilename = NULL; size_t extracertsfilename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppzza!|lp",
&infilename, &infilename_len, &outfilename, &outfilename_len,
@ -4263,8 +4263,8 @@ PHP_FUNCTION(openssl_pkcs7_decrypt)
zend_resource *certresval, *keyresval;
BIO * in = NULL, * out = NULL, * datain = NULL;
PKCS7 * p7 = NULL;
char * infilename; int infilename_len;
char * outfilename; int outfilename_len;
char * infilename; size_t infilename_len;
char * outfilename; size_t outfilename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppz|z", &infilename, &infilename_len,
&outfilename, &outfilename_len, &recipcert, &recipkey) == FAILURE) {
@ -4333,7 +4333,7 @@ PHP_FUNCTION(openssl_private_encrypt)
int successful = 0;
zend_resource *keyresource = NULL;
char * data;
int data_len;
size_t data_len;
zend_long padding = RSA_PKCS1_PADDING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/z|l", &data, &data_len, &crypted, &key, &padding) == FAILURE) {
@ -4393,7 +4393,7 @@ PHP_FUNCTION(openssl_private_decrypt)
zend_long padding = RSA_PKCS1_PADDING;
zend_resource *keyresource = NULL;
char * data;
int data_len;
size_t data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/z|l", &data, &data_len, &crypted, &key, &padding) == FAILURE) {
return;
@ -4458,7 +4458,7 @@ PHP_FUNCTION(openssl_public_encrypt)
zend_resource *keyresource = NULL;
zend_long padding = RSA_PKCS1_PADDING;
char * data;
int data_len;
size_t data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/z|l", &data, &data_len, &crypted, &key, &padding) == FAILURE)
return;
@ -4516,7 +4516,7 @@ PHP_FUNCTION(openssl_public_decrypt)
zend_resource *keyresource = NULL;
zend_long padding = RSA_PKCS1_PADDING;
char * data;
int data_len;
size_t data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/z|l", &data, &data_len, &crypted, &key, &padding) == FAILURE) {
return;
@ -4601,7 +4601,7 @@ PHP_FUNCTION(openssl_sign)
zend_string *sigbuf;
zend_resource *keyresource = NULL;
char * data;
int data_len;
size_t data_len;
EVP_MD_CTX md_ctx;
zval *method = NULL;
zend_long signature_algo = OPENSSL_ALGO_SHA1;
@ -4664,8 +4664,8 @@ PHP_FUNCTION(openssl_verify)
EVP_MD_CTX md_ctx;
const EVP_MD *mdtype;
zend_resource *keyresource = NULL;
char * data; int data_len;
char * signature; int signature_len;
char * data; size_t data_len;
char * signature; size_t signature_len;
zval *method = NULL;
zend_long signature_algo = OPENSSL_ALGO_SHA1;
@ -4717,7 +4717,7 @@ PHP_FUNCTION(openssl_seal)
zend_resource ** key_resources; /* so we know what to cleanup */
int i, len1, len2, *eksl, nkeys;
unsigned char *buf = NULL, **eks;
char * data; int data_len;
char * data; size_t data_len;
char *method =NULL;
int method_len = 0;
const EVP_CIPHER *cipher;
@ -4844,8 +4844,8 @@ PHP_FUNCTION(openssl_open)
unsigned char *buf;
zend_resource *keyresource = NULL;
EVP_CIPHER_CTX ctx;
char * data; int data_len;
char * ekey; int ekey_len;
char * data; size_t data_len;
char * ekey; size_t ekey_len;
char *method =NULL;
int method_len = 0;
const EVP_CIPHER *cipher;
@ -5027,7 +5027,7 @@ PHP_FUNCTION(openssl_encrypt)
{
zend_long options = 0;
char *data, *method, *password, *iv = "";
int data_len, method_len, password_len, iv_len = 0, max_iv_len;
size_t data_len, method_len, password_len, iv_len = 0, max_iv_len;
const EVP_CIPHER *cipher_type;
EVP_CIPHER_CTX cipher_ctx;
int i=0, outlen, keylen;
@ -5057,7 +5057,7 @@ PHP_FUNCTION(openssl_encrypt)
if (iv_len <= 0 && max_iv_len > 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Using an empty Initialization Vector (iv) is potentially insecure and not recommended");
}
free_iv = php_openssl_validate_iv(&iv, &iv_len, max_iv_len TSRMLS_CC);
free_iv = php_openssl_validate_iv(&iv, (int *)&iv_len, max_iv_len TSRMLS_CC);
outlen = data_len + EVP_CIPHER_block_size(cipher_type);
outbuf = zend_string_alloc(outlen, 0);
@ -5107,7 +5107,7 @@ PHP_FUNCTION(openssl_decrypt)
{
zend_long options = 0;
char *data, *method, *password, *iv = "";
int data_len, method_len, password_len, iv_len = 0;
size_t data_len, method_len, password_len, iv_len = 0;
const EVP_CIPHER *cipher_type;
EVP_CIPHER_CTX cipher_ctx;
int i, outlen, keylen;
@ -5150,7 +5150,7 @@ PHP_FUNCTION(openssl_decrypt)
key = (unsigned char*)password;
}
free_iv = php_openssl_validate_iv(&iv, &iv_len, EVP_CIPHER_iv_length(cipher_type) TSRMLS_CC);
free_iv = php_openssl_validate_iv(&iv, (int *)&iv_len, EVP_CIPHER_iv_length(cipher_type) TSRMLS_CC);
outlen = data_len + EVP_CIPHER_block_size(cipher_type);
outbuf = zend_string_alloc(outlen, 0);
@ -5191,7 +5191,7 @@ PHP_FUNCTION(openssl_decrypt)
PHP_FUNCTION(openssl_cipher_iv_length)
{
char *method;
int method_len;
size_t method_len;
const EVP_CIPHER *cipher_type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len) == FAILURE) {
@ -5220,7 +5220,7 @@ PHP_FUNCTION(openssl_dh_compute_key)
{
zval *key;
char *pub_str;
int pub_len;
size_t pub_len;
EVP_PKEY *pkey;
BIGNUM *pub;
zend_string *data;

2
ext/pcntl/pcntl.c
View File

@ -750,7 +750,7 @@ PHP_FUNCTION(pcntl_exec)
int pair_length;
zend_string *key;
char *path;
int path_len;
size_t path_len;
zend_ulong key_num;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|aa", &path, &path_len, &args, &envs) == FAILURE) {

4
ext/pcre/php_pcre.c
View File

@ -1764,10 +1764,10 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, char *subject, int subjec
Quote regular expression characters plus an optional character */
static PHP_FUNCTION(preg_quote)
{
int in_str_len;
size_t in_str_len;
char *in_str; /* Input string argument */
char *in_str_end; /* End of the input string */
int delim_len = 0;
size_t delim_len = 0;
char *delim = NULL; /* Additional delimiter argument */
zend_string *out_str; /* Output string with quoted characters */
char *p, /* Iterator for input string */

16
ext/pdo/pdo_dbh.c
View File

@ -200,10 +200,10 @@ static PHP_METHOD(PDO, dbh_constructor)
pdo_dbh_t *dbh = NULL;
zend_bool is_persistent = 0;
char *data_source;
int data_source_len;
size_t data_source_len;
char *colon;
char *username=NULL, *password=NULL;
int usernamelen, passwordlen;
size_t usernamelen, passwordlen;
pdo_driver_t *driver = NULL;
zval *options = NULL;
char alt_dsn[512];
@ -480,7 +480,7 @@ static PHP_METHOD(PDO, prepare)
{
pdo_stmt_t *stmt;
char *statement;
int statement_len;
size_t statement_len;
zval *options = NULL, *opt, *item, ctor_args;
zend_class_entry *dbstmt_ce, *pce;
pdo_dbh_object_t *dbh_obj = Z_PDO_OBJECT_P(getThis());
@ -923,7 +923,7 @@ static PHP_METHOD(PDO, exec)
{
pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis());
char *statement;
int statement_len;
size_t statement_len;
zend_long ret;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &statement, &statement_len)) {
@ -952,7 +952,7 @@ static PHP_METHOD(PDO, lastInsertId)
{
pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis());
char *name = NULL;
int namelen;
size_t namelen;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &name, &namelen)) {
RETURN_FALSE;
@ -1058,7 +1058,7 @@ static PHP_METHOD(PDO, query)
{
pdo_stmt_t *stmt;
char *statement;
int statement_len;
size_t statement_len;
pdo_dbh_object_t *dbh_obj = Z_PDO_OBJECT_P(getThis());
pdo_dbh_t *dbh = dbh_obj->inner;
@ -1135,7 +1135,7 @@ static PHP_METHOD(PDO, quote)
{
pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis());
char *str;
int str_len;
size_t str_len;
zend_long paramtype = PDO_PARAM_STR;
char *qstr;
int qlen;
@ -1271,7 +1271,7 @@ int pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind TSRMLS_DC)
const zend_function_entry *funcs;
zend_function func;
zend_internal_function *ifunc = (zend_internal_function*)&func;
int namelen;
size_t namelen;
char *lc_name;
pdo_dbh_t *dbh = dbh_obj->inner;

12
ext/pdo_pgsql/pgsql_driver.c
View File

@ -522,7 +522,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromArray)
zval *pg_rows;
char *table_name, *pg_delim = NULL, *pg_null_as = NULL, *pg_fields = NULL;
int table_name_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
size_t table_name_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
char *query;
PGresult *pgsql_result;
@ -631,7 +631,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromFile)
pdo_pgsql_db_handle *H;
char *table_name, *filename, *pg_delim = NULL, *pg_null_as = NULL, *pg_fields = NULL;
int table_name_len, filename_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
size_t table_name_len, filename_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
char *query;
PGresult *pgsql_result;
ExecStatusType status;
@ -825,7 +825,7 @@ static PHP_METHOD(PDO, pgsqlCopyToArray)
pdo_pgsql_db_handle *H;
char *table_name, *pg_delim = NULL, *pg_null_as = NULL, *pg_fields = NULL;
int table_name_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
size_t table_name_len, pg_delim_len = 0, pg_null_as_len = 0, pg_fields_len;
char *query;
PGresult *pgsql_result;
@ -930,9 +930,9 @@ static PHP_METHOD(PDO, pgsqlLOBOpen)
Oid oid;
int lfd;
char *oidstr;
int oidstrlen;
size_t oidstrlen;
char *modestr = "rb";
int modestrlen;
size_t modestrlen;
int mode = INV_READ;
char *end_ptr;
@ -981,7 +981,7 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink)
pdo_pgsql_db_handle *H;
Oid oid;
char *oidstr, *end_ptr;
int oidlen;
size_t oidlen;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&oidstr, &oidlen)) {

6
ext/pdo_sqlite/sqlite_driver.c
View File

@ -521,7 +521,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction)
struct pdo_sqlite_func *func;
zval *callback;
char *func_name;
int func_name_len;
size_t func_name_len;
zend_long argc = -1;
zend_string *cbname = NULL;
pdo_dbh_t *dbh;
@ -591,7 +591,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
struct pdo_sqlite_func *func;
zval *step_callback, *fini_callback;
char *func_name;
int func_name_len;
size_t func_name_len;
zend_long argc = -1;
zend_string *cbname = NULL;
pdo_dbh_t *dbh;
@ -652,7 +652,7 @@ static PHP_METHOD(SQLite, sqliteCreateCollation)
struct pdo_sqlite_collation *collation;
zval *callback;
char *collation_name;
int collation_name_len;
size_t collation_name_len;
zend_string *cbname = NULL;
pdo_dbh_t *dbh;
pdo_sqlite_db_handle *H;

42
ext/pgsql/pgsql.c
View File

@ -1918,7 +1918,7 @@ PHP_FUNCTION(pg_query_params)
zval *pgsql_link = NULL;
zval *pv_param_arr, *tmp;
char *query;
int query_len, id = -1, argc = ZEND_NUM_ARGS();
size_t query_len, id = -1, argc = ZEND_NUM_ARGS();
int leftover = 0;
int num_params = 0;
char **params = NULL;
@ -2119,7 +2119,7 @@ PHP_FUNCTION(pg_execute)
zval *pgsql_link = NULL;
zval *pv_param_arr, *tmp;
char *stmtname;
int stmtname_len, id = -1, argc = ZEND_NUM_ARGS();
size_t stmtname_len, id = -1, argc = ZEND_NUM_ARGS();
int leftover = 0;
int num_params = 0;
char **params = NULL;
@ -3077,7 +3077,7 @@ PHP_FUNCTION(pg_last_oid)
PHP_FUNCTION(pg_trace)
{
char *z_filename, *mode = "w";
int z_filename_len, mode_len;
size_t z_filename_len, mode_len;
zval *pgsql_link = NULL;
int id = -1, argc = ZEND_NUM_ARGS();
PGconn *pgsql;
@ -3222,7 +3222,7 @@ PHP_FUNCTION(pg_lo_unlink)
zval *pgsql_link = NULL;
zend_long oid_long;
char *oid_string, *end_ptr;
int oid_strlen;
size_t oid_strlen;
PGconn *pgsql;
Oid oid;
int id = -1;
@ -3292,7 +3292,7 @@ PHP_FUNCTION(pg_lo_open)
zval *pgsql_link = NULL;
zend_long oid_long;
char *oid_string, *end_ptr, *mode_string;
int oid_strlen, mode_strlen;
size_t oid_strlen, mode_strlen;
PGconn *pgsql;
Oid oid;
int id = -1, pgsql_mode=0, pgsql_lofd;
@ -3471,7 +3471,7 @@ PHP_FUNCTION(pg_lo_write)
zval *pgsql_id;
char *str;
zend_long z_len;
int str_len, nbytes;
size_t str_len, nbytes;
int len;
pgLofp *pgsql;
int argc = ZEND_NUM_ARGS();
@ -3536,7 +3536,8 @@ PHP_FUNCTION(pg_lo_import)
{
zval *pgsql_link = NULL, *oid = NULL;
char *file_in;
int id = -1, name_len;
int id = -1;
size_t name_len;
int argc = ZEND_NUM_ARGS();
PGconn *pgsql;
Oid returned_oid;
@ -3623,8 +3624,9 @@ PHP_FUNCTION(pg_lo_export)
{
zval *pgsql_link = NULL;
char *file_out, *oid_string, *end_ptr;
int oid_strlen;
int id = -1, name_len;
size_t oid_strlen;
int id = -1;
size_t name_len;
zend_long oid_long;
Oid oid;
PGconn *pgsql;
@ -3989,7 +3991,7 @@ PHP_FUNCTION(pg_copy_to)
{
zval *pgsql_link;
char *table_name, *pg_delim = NULL, *pg_null_as = NULL;
int table_name_len, pg_delim_len, pg_null_as_len, free_pg_null = 0;
size_t table_name_len, pg_delim_len, pg_null_as_len, free_pg_null = 0;
char *query;
int id = -1;
PGconn *pgsql;
@ -4126,7 +4128,7 @@ PHP_FUNCTION(pg_copy_from)
zval *pgsql_link = NULL, *pg_rows;
zval *tmp;
char *table_name, *pg_delim = NULL, *pg_null_as = NULL;
int table_name_len, pg_delim_len, pg_null_as_len;
size_t table_name_len, pg_delim_len, pg_null_as_len;
int pg_null_as_free = 0;
char *query;
int id = -1;
@ -4937,7 +4939,8 @@ PHP_FUNCTION(pg_send_prepare)
{
zval *pgsql_link;
char *query, *stmtname;
int stmtname_len, query_len, id = -1;
size_t stmtname_len, query_len;
int id = -1;
PGconn *pgsql;
int is_non_blocking;
int ret;
@ -5014,7 +5017,8 @@ PHP_FUNCTION(pg_send_execute)
int num_params = 0;
char **params = NULL;
char *stmtname;
int stmtname_len, id = -1;
size_t stmtname_len;
int id = -1;
PGconn *pgsql;
int is_non_blocking;
int ret;
@ -5506,7 +5510,7 @@ PHP_FUNCTION(pg_meta_data)
{
zval *pgsql_link;
char *table_name;
uint table_name_len;
size_t table_name_len;
zend_bool extended=0;
PGconn *pgsql;
int id = -1;
@ -6351,7 +6355,7 @@ PHP_FUNCTION(pg_convert)
{
zval *pgsql_link, *values;
char *table_name;
int table_name_len;
size_t table_name_len;
zend_ulong option = 0;
PGconn *pg_link;
int id = -1;
@ -6562,7 +6566,7 @@ PHP_FUNCTION(pg_insert)
{
zval *pgsql_link, *values;
char *table;
int table_len;
size_t table_len;
zend_ulong option = PGSQL_DML_EXEC, return_sql;
PGconn *pg_link;
PGresult *pg_result;
@ -6778,7 +6782,7 @@ PHP_FUNCTION(pg_update)
{
zval *pgsql_link, *values, *ids;
char *table;
int table_len;
size_t table_len;
zend_ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
zend_string *sql = NULL;
@ -6868,7 +6872,7 @@ PHP_FUNCTION(pg_delete)
{
zval *pgsql_link, *ids;
char *table;
int table_len;
size_t table_len;
zend_ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
zend_string *sql;
@ -6998,7 +7002,7 @@ PHP_FUNCTION(pg_select)
{
zval *pgsql_link, *ids;
char *table;
int table_len;
size_t table_len;
zend_ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
zend_string *sql = NULL;

16
ext/phar/func_interceptors.c
View File

@ -26,7 +26,7 @@
PHAR_FUNC(phar_opendir) /* {{{ */
{
char *filename;
int filename_len;
size_t filename_len;
zval *zcontext = NULL;
if (!PHAR_G(intercepted)) {
@ -94,7 +94,7 @@ skip_phar:
PHAR_FUNC(phar_file_get_contents) /* {{{ */
{
char *filename;
int filename_len;
size_t filename_len;
zend_string *contents;
zend_bool use_include_path = 0;
php_stream *stream;
@ -224,7 +224,7 @@ skip_phar:
PHAR_FUNC(phar_readfile) /* {{{ */
{
char *filename;
int filename_len;
size_t filename_len;
int size = 0;
zend_bool use_include_path = 0;
zval *zcontext = NULL;
@ -320,7 +320,7 @@ skip_phar:
PHAR_FUNC(phar_fopen) /* {{{ */
{
char *filename, *mode;
int filename_len, mode_len;
size_t filename_len, mode_len;
zend_bool use_include_path = 0;
zval *zcontext = NULL;
php_stream *stream;
@ -339,7 +339,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
}
if (use_include_path || (!IS_ABSOLUTE_PATH(filename, filename_len) && !strstr(filename, "://"))) {
char *arch, *entry, *fname;
int arch_len, entry_len, fname_len;
size_t arch_len, entry_len, fname_len;
php_stream_context *context = NULL;
char *name;
phar_archive_data *phar;
@ -805,7 +805,7 @@ void fname(INTERNAL_FUNCTION_PARAMETERS) { \
PHAR_G(orig)(INTERNAL_FUNCTION_PARAM_PASSTHRU); \
} else { \
char *filename; \
int filename_len; \
size_t filename_len; \
\
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) { \
return; \
@ -889,7 +889,7 @@ PharFileFunction(phar_is_dir, FS_IS_DIR, orig_is_dir)
PHAR_FUNC(phar_is_file) /* {{{ */
{
char *filename;
int filename_len;
size_t filename_len;
if (!PHAR_G(intercepted)) {
goto skip_phar;
@ -956,7 +956,7 @@ skip_phar:
PHAR_FUNC(phar_is_link) /* {{{ */
{
char *filename;
int filename_len;
size_t filename_len;
if (!PHAR_G(intercepted)) {
goto skip_phar;

18
ext/phar/phar_object.c
View File

@ -322,7 +322,7 @@ static void phar_do_403(char *entry, int entry_len TSRMLS_DC) /* {{{ */
}
/* }}} */
static void phar_do_404(phar_archive_data *phar, char *fname, int fname_len, char *f404, int f404_len, char *entry, int entry_len TSRMLS_DC) /* {{{ */
static void phar_do_404(phar_archive_data *phar, char *fname, int fname_len, char *f404, size_t f404_len, char *entry, size_t entry_len TSRMLS_DC) /* {{{ */
{
sapi_header_line ctr = {0};
phar_entry_info *info;
@ -545,7 +545,7 @@ PHP_METHOD(Phar, webPhar)
{
zval *mimeoverride = NULL, *rewrite = NULL;
char *alias = NULL, *error, *index_php = NULL, *f404 = NULL, *ru = NULL;
int alias_len = 0, f404_len = 0, free_pathinfo = 0, ru_len = 0;
size_t alias_len = 0, f404_len = 0, free_pathinfo = 0, ru_len = 0;
char *fname, *path_info, *mime_type = NULL, *entry, *pt;
const char *basename;
int fname_len, entry_len, code, index_php_len = 0, not_cgi;
@ -921,7 +921,7 @@ PHP_METHOD(Phar, interceptFileFuncs)
PHP_METHOD(Phar, createDefaultStub)
{
char *index = NULL, *webindex = NULL, *stub, *error;
int index_len = 0, webindex_len = 0;
size_t index_len = 0, webindex_len = 0;
size_t stub_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &index, &index_len, &webindex, &webindex_len) == FAILURE) {
@ -1846,7 +1846,7 @@ PHP_METHOD(Phar, buildFromIterator)
{
zval *obj;
char *error;
uint base_len = 0;
size_t base_len = 0;
char *base = NULL;
struct _phar_t pass;
@ -1993,7 +1993,7 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext, zend
zend_class_entry *ce;
char *error;
const char *pcr_error;
int ext_len = ext ? strlen(ext) : 0;
size_t ext_len = ext ? strlen(ext) : 0;
int oldname_len;
phar_archive_data *pphar = NULL;
php_stream_statbuf ssb;
@ -2964,7 +2964,7 @@ PHP_METHOD(Phar, setSignatureAlgorithm)
{
zend_long algo;
char *error, *key = NULL;
int key_len = 0;
size_t key_len = 0;
PHAR_ARCHIVE_OBJECT();
@ -3547,7 +3547,7 @@ PHP_METHOD(Phar, offsetGet)
/* {{{ add a file within the phar archive from a string or resource
*/
static void phar_add_file(phar_archive_data **pphar, char *filename, int filename_len, char *cont_str, int cont_len, zval *zresource TSRMLS_DC)
static void phar_add_file(phar_archive_data **pphar, char *filename, int filename_len, char *cont_str, size_t cont_len, zval *zresource TSRMLS_DC)
{
char *error;
size_t contents_len;
@ -3805,7 +3805,7 @@ PHP_METHOD(Phar, addFile)
PHP_METHOD(Phar, addFromString)
{
char *localname, *cont_str;
int localname_len, cont_len;
size_t localname_len, cont_len;
PHAR_ARCHIVE_OBJECT();
@ -4186,7 +4186,7 @@ PHP_METHOD(Phar, extractTo)
php_stream_statbuf ssb;
phar_entry_info *entry;
char *pathto, *filename, *actual;
int pathto_len, filename_len;
size_t pathto_len, filename_len;
int ret, i;
int nelems;
zval *zval_files = NULL;

12
ext/posix/posix.c
View File

@ -835,7 +835,7 @@ PHP_FUNCTION(posix_getcwd)
PHP_FUNCTION(posix_mkfifo)
{
char *path;
int path_len;
size_t path_len;
zend_long mode;
int result;
@ -864,7 +864,7 @@ PHP_FUNCTION(posix_mkfifo)
PHP_FUNCTION(posix_mknod)
{
char *path;
int path_len;
size_t path_len;
zend_long mode;
zend_long major = 0, minor = 0;
int result;
@ -948,7 +948,7 @@ int php_posix_group_to_array(struct group *g, zval *array_group) /* {{{ */
PHP_FUNCTION(posix_access)
{
zend_long mode = 0;
int filename_len, ret;
size_t filename_len, ret;
char *filename, *path;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|l", &filename, &filename_len, &mode) == FAILURE) {
@ -992,7 +992,7 @@ PHP_FUNCTION(posix_getgrnam)
{
char *name;
struct group *g;
int name_len;
size_t name_len;
#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
struct group gbuf;
long buflen;
@ -1111,7 +1111,7 @@ PHP_FUNCTION(posix_getpwnam)
{
struct passwd *pw;
char *name;
int name_len;
size_t name_len;
#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
struct passwd pwbuf;
long buflen;
@ -1355,7 +1355,7 @@ PHP_FUNCTION(posix_initgroups)
{
zend_long basegid;
char *name;
int name_len;
size_t name_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &name, &name_len, &basegid) == FAILURE) {
RETURN_FALSE;

20
ext/pspell/pspell.c
View File

@ -264,7 +264,7 @@ static PHP_MINIT_FUNCTION(pspell)
static PHP_FUNCTION(pspell_new)
{
char *language, *spelling = NULL, *jargon = NULL, *encoding = NULL;
int language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
size_t language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
zend_long mode = Z_L(0), speed = Z_L(0);
int argc = ZEND_NUM_ARGS();
zval *ind;
@ -361,7 +361,7 @@ static PHP_FUNCTION(pspell_new)
static PHP_FUNCTION(pspell_new_personal)
{
char *personal, *language, *spelling = NULL, *jargon = NULL, *encoding = NULL;
int personal_len, language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
size_t personal_len, language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
zend_long mode = Z_L(0), speed = Z_L(0);
int argc = ZEND_NUM_ARGS();
zval *ind;
@ -495,7 +495,7 @@ static PHP_FUNCTION(pspell_new_config)
Returns true if word is valid */
static PHP_FUNCTION(pspell_check)
{
int word_len;
size_t word_len;
zend_long scin;
char *word;
PspellManager *manager;
@ -520,7 +520,7 @@ static PHP_FUNCTION(pspell_suggest)
{
zend_long scin;
char *word;
int word_len;
size_t word_len;
PspellManager *manager;
const PspellWordList *wl;
const char *sug;
@ -551,7 +551,7 @@ static PHP_FUNCTION(pspell_suggest)
Notify the dictionary of a user-selected replacement */
static PHP_FUNCTION(pspell_store_replacement)
{
int miss_len, corr_len;
size_t miss_len, corr_len;
zend_long scin;
char *miss, *corr;
PspellManager *manager;
@ -576,7 +576,7 @@ static PHP_FUNCTION(pspell_store_replacement)
Adds a word to a personal list */
static PHP_FUNCTION(pspell_add_to_personal)
{
int word_len;
size_t word_len;
zend_long scin;
char *word;
PspellManager *manager;
@ -606,7 +606,7 @@ static PHP_FUNCTION(pspell_add_to_personal)
Adds a word to the current session */
static PHP_FUNCTION(pspell_add_to_session)
{
int word_len;
size_t word_len;
zend_long scin;
char *word;
PspellManager *manager;
@ -685,7 +685,7 @@ static PHP_FUNCTION(pspell_save_wordlist)
static PHP_FUNCTION(pspell_config_create)
{
char *language, *spelling = NULL, *jargon = NULL, *encoding = NULL;
int language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
size_t language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
zval *ind;
PspellConfig *config;
@ -819,7 +819,7 @@ static void pspell_config_path(INTERNAL_FUNCTION_PARAMETERS, char *option)
{
zend_long conf;
char *value;
int value_len;
size_t value_len;
PspellConfig *config;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lp", &conf, &value, &value_len) == FAILURE) {
@ -867,7 +867,7 @@ static PHP_FUNCTION(pspell_config_repl)
{
zend_long conf;
char *repl;
int repl_len;
size_t repl_len;
PspellConfig *config;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lp", &conf, &repl, &repl_len) == FAILURE) {

12
ext/readline/readline.c
View File

@ -213,7 +213,7 @@ PHP_MINFO_FUNCTION(readline)
PHP_FUNCTION(readline)
{
char *prompt = NULL;
int prompt_len;
size_t prompt_len;
char *result;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &prompt, &prompt_len)) {
@ -240,7 +240,7 @@ PHP_FUNCTION(readline_info)
{
char *what = NULL;
zval *value = NULL;
int what_len, oldval;
size_t what_len, oldval;
char *oldstr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sz", &what, &what_len, &value) == FAILURE) {
@ -336,7 +336,7 @@ PHP_FUNCTION(readline_info)
PHP_FUNCTION(readline_add_history)
{
char *arg;
int arg_len;
size_t arg_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
return;
@ -396,7 +396,7 @@ PHP_FUNCTION(readline_list_history)
PHP_FUNCTION(readline_read_history)
{
char *arg = NULL;
int arg_len;
size_t arg_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|p", &arg, &arg_len) == FAILURE) {
return;
@ -420,7 +420,7 @@ PHP_FUNCTION(readline_read_history)
PHP_FUNCTION(readline_write_history)
{
char *arg = NULL;
int arg_len;
size_t arg_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|p", &arg, &arg_len) == FAILURE) {
return;
@ -563,7 +563,7 @@ PHP_FUNCTION(readline_callback_handler_install)
zval *callback;
zend_string *name = NULL;
char *prompt;
int prompt_len;
size_t prompt_len;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &prompt, &prompt_len, &callback)) {
return;

Some files were not shown because too many files have changed in this diff Show More