php-win-ext/pecl-processing-rrd
1
0
Fork 0
mirror of https://github.com/php-win-ext/pecl-processing-rrd.git synced 2026-03-24 00:52:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

utilize ZSTR macros for zend string

Browse Source 
git-svn-id: http://svn.php.net/repository/pecl/rrd/trunk@338376 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Miroslav Kubelik
2015-12-28 11:16:32 +00:00
parent edd1e65141
commit 92d1ea41df
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rrd_create.c
View File

@@ -119,7 +119,7 @@ PHP_METHOD(RRDCreator, __construct)
return;
}
if (argc > 1 && start_time->len == 0) {
if (argc > 1 && ZSTR_LEN(start_time) == 0) {
zend_throw_exception(NULL,
"startTime cannot be empty string", 0);
return;
@@ -132,7 +132,7 @@ PHP_METHOD(RRDCreator, __construct)
intern_obj = php_rrd_create_fetch_object(Z_OBJ_P(getThis()));
intern_obj->file_path = estrdup(path);
if (start_time) intern_obj->start_time = estrdup(start_time->val);
if (start_time) intern_obj->start_time = estrdup(ZSTR_VAL(start_time));
if (step) {
ZVAL_LONG(&intern_obj->zv_step, step);
}
@@ -152,7 +152,7 @@ PHP_METHOD(RRDCreator, addDataSource)
return;
}
if (description->len == 0) {
if (ZSTR_LEN(description) == 0) {
zend_throw_exception(NULL,
"description parameter cannot be empty string", 0);
return;
@@ -165,9 +165,9 @@ PHP_METHOD(RRDCreator, addDataSource)
array_init(&intern_obj->zv_arr_data_sources);
}
rrd_source_desc = emalloc(description->len + 4);
rrd_source_desc = emalloc(ZSTR_LEN(description) + 4);
strcpy(rrd_source_desc, "DS:");
strcat(rrd_source_desc, description->val);
strcat(rrd_source_desc, ZSTR_VAL(description));
add_next_index_string(&intern_obj->zv_arr_data_sources, rrd_source_desc);
efree(rrd_source_desc);
@@ -187,7 +187,7 @@ PHP_METHOD(RRDCreator, addArchive)
return;
}
if (description->len == 0) {
if (ZSTR_LEN(description) == 0) {
zend_throw_exception(NULL,
"description parameter cannot be empty string", 0);
return;
@@ -199,9 +199,9 @@ PHP_METHOD(RRDCreator, addArchive)
array_init(&intern_obj->zv_arr_archives);
}
rrd_archive_desc = emalloc(description->len + 5);
rrd_archive_desc = emalloc(ZSTR_LEN(description) + 5);
strcpy(rrd_archive_desc, "RRA:");
strcat(rrd_archive_desc, description->val);
strcat(rrd_archive_desc, ZSTR_VAL(description));
add_next_index_string(&intern_obj->zv_arr_archives, rrd_archive_desc);
efree(rrd_archive_desc);

2
rrd_graph.c
View File

@@ -146,7 +146,7 @@ static rrd_args *rrd_graph_obj_create_argv(const char *command_name, const rrd_g
* "key=value" e.g. "--start=920804400"
*/
if (zs_key) {
smart_string_appends(&option, zs_key->val);
smart_string_appends(&option, ZSTR_VAL(zs_key));
smart_string_appendc(&option, '=');
}

2
rrd_update.c
View File

@@ -148,7 +148,7 @@ PHP_METHOD(RRDUpdater, update)
smart_string_appends(&ds_names, "--template=");
}
smart_string_appends(&ds_names, zs_ds_name->val);
smart_string_appends(&ds_names, ZSTR_VAL(zs_ds_name));
/* "timestamp:ds1Value:ds2Value" string */
if (!ds_vals.len) {