X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_rrdcreate.c;h=44c2386f16ad74775a9bcabaaa09d497658343b3;hb=1ebf2f31;hp=39f42b205a2c5e22510445dfcea84c107ed29748;hpb=d38c16d60f9d1b10cb60f010ce086135e6ecbe07;p=collectd.git diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c index 39f42b20..44c2386f 100644 --- a/src/utils_rrdcreate.c +++ b/src/utils_rrdcreate.c @@ -62,7 +62,7 @@ static int rra_timespans[] = }; static int rra_timespans_num = STATIC_ARRAY_SIZE (rra_timespans); -static char *rra_types[] = +static const char *const rra_types[] = { "AVERAGE", "MIN", @@ -305,7 +305,7 @@ static int ds_get (char ***ret, /* {{{ */ for (ds_num = 0; ds_num < ds->ds_num; ds_num++) { data_source_t *d = ds->ds + ds_num; - char *type; + const char *type; int status; ds_def[ds_num] = NULL; @@ -421,7 +421,7 @@ static int srrd_create (const char *filename, /* {{{ */ char last_up_str[16]; new_argc = 6 + argc; - new_argv = (char **) malloc ((new_argc + 1) * sizeof (char *)); + new_argv = malloc ((new_argc + 1) * sizeof (*new_argv)); if (new_argv == NULL) { ERROR ("rrdtool plugin: malloc failed."); @@ -689,7 +689,7 @@ int cu_rrd_create_file (const char *filename, /* {{{ */ argc = ds_num + rra_num; - if ((argv = (char **) malloc (sizeof (char *) * (argc + 1))) == NULL) + if ((argv = malloc (sizeof (*argv) * (argc + 1))) == NULL) { char errbuf[1024]; ERROR ("cu_rrd_create_file failed: %s",