projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.3' into collectd-4.4
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
93c9d7a
..
3b2c54f
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-285,7
+285,7
@@
static int ds_get (char ***ret, const data_set_t *ds, const value_list_t *vl)
if (isnan (d->min))
{
if (isnan (d->min))
{
- s
trcpy (min, "U"
);
+ s
strncpy (min, "U", sizeof (min)
);
}
else
{
}
else
{
@@
-295,7
+295,7
@@
static int ds_get (char ***ret, const data_set_t *ds, const value_list_t *vl)
if (isnan (d->max))
{
if (isnan (d->max))
{
- s
trcpy (max, "U"
);
+ s
strncpy (max, "U", sizeof (max)
);
}
else
{
}
else
{
@@
-342,7
+342,7
@@
static int srrd_create (char *filename, unsigned long pdp_step, time_t last_up,
optind = 0; /* bug in librrd? */
rrd_clear_error ();
optind = 0; /* bug in librrd? */
rrd_clear_error ();
- status = rrd_create_r (filename, pdp_step, last_up, argc, argv);
+ status = rrd_create_r (filename, pdp_step, last_up, argc,
(void *)
argv);
if (status != 0)
{
if (status != 0)
{
@@
-360,7
+360,7
@@
static int srrd_update (char *filename, char *template, int argc, char **argv)
optind = 0; /* bug in librrd? */
rrd_clear_error ();
optind = 0; /* bug in librrd? */
rrd_clear_error ();
- status = rrd_update_r (filename, template, argc, argv);
+ status = rrd_update_r (filename, template, argc,
(void *)
argv);
if (status != 0)
{
if (status != 0)
{