From e519c131cba87e48dbeb5b4611599278c7ffd08b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Jun 2015 16:20:26 +0000 Subject: [PATCH] zend_parse_parameter expect size_t for string size git-svn-id: http://svn.php.net/repository/pecl/rrd/trunk@336981 c90b9560-bf6c-de11-be94-00142212c4b1 --- rrd_create.c | 10 +++++----- rrd_graph.c | 4 ++-- rrd_info.c | 2 +- rrd_update.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rrd_create.c b/rrd_create.c index 9d48afb..a0966b5 100644 --- a/rrd_create.c +++ b/rrd_create.c @@ -102,9 +102,9 @@ creates new object for creating rrd database PHP_METHOD(RRDCreator, __construct) { rrd_create_object *intern_obj; - char *path; int path_length; + char *path; size_t path_length; /* better to set defaults for optional parameters */ - char *start_time = NULL; int start_time_length = 0; + char *start_time = NULL; size_t start_time_length = 0; long step = 0; int argc = ZEND_NUM_ARGS(); @@ -146,7 +146,7 @@ PHP_METHOD(RRDCreator, addDataSource) { rrd_create_object *intern_obj; char *desc, *rrd_source_desc; - int desc_length; + size_t desc_length; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &desc, &desc_length) == FAILURE) { return; @@ -181,7 +181,7 @@ PHP_METHOD(RRDCreator, addArchive) { rrd_create_object *intern_obj; char *desc, *rrd_archive_desc; - int desc_length; + size_t desc_length; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &desc, &desc_length) == FAILURE) { return; @@ -284,7 +284,7 @@ PHP_METHOD(RRDCreator, save) PHP_FUNCTION(rrd_create) { char *filename; - int filename_length; + size_t filename_length; zval *zv_arr_options; rrd_args *argv; diff --git a/rrd_graph.c b/rrd_graph.c index 1fe8782..aafc12e 100644 --- a/rrd_graph.c +++ b/rrd_graph.c @@ -89,7 +89,7 @@ PHP_METHOD(RRDGraph, __construct) { rrd_graph_object *intern_obj; char *path; - int path_length; + size_t path_length; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_length) == FAILURE) { return; @@ -294,7 +294,7 @@ PHP_METHOD(RRDGraph, saveVerbose) PHP_FUNCTION(rrd_graph) { char *filename; - int filename_length; + size_t filename_length; zval *zv_arr_options; rrd_args *argv; /* returned values if rrd_graph doesn't fail */ diff --git a/rrd_info.c b/rrd_info.c index 2fb73b8..553f0cd 100644 --- a/rrd_info.c +++ b/rrd_info.c @@ -25,7 +25,7 @@ PHP_FUNCTION(rrd_info) { char *filename; - int filename_length; + size_t filename_length; /* list of arguments for rrd_info call, it's more efficient then u * usage of rrd_args, because there isn't array of arguments in parameters */ diff --git a/rrd_update.c b/rrd_update.c index da199a2..96346a7 100644 --- a/rrd_update.c +++ b/rrd_update.c @@ -83,7 +83,7 @@ PHP_METHOD(RRDUpdater, __construct) { rrd_update_object *intern_obj; char *path; - int path_length; + size_t path_length; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_length) == FAILURE) { return; @@ -107,7 +107,7 @@ PHP_METHOD(RRDUpdater, update) rrd_args *update_argv; char *time = NULL; - int time_str_length = 0; + size_t time_str_length = 0; int argc = ZEND_NUM_ARGS(); zend_string *zs_ds_name; @@ -215,7 +215,7 @@ PHP_METHOD(RRDUpdater, update) PHP_FUNCTION(rrd_update) { char *filename; - int filename_length; + size_t filename_length; zval *zv_arr_options; rrd_args *argv;