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.4' into collectd-4.5
[collectd.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
b56fc5a
..
c31b30e
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-109,9
+109,9
@@
static void memory_submit (const char *type_instance, gauge_t value)
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "memory"
);
- s
trcpy (vl.type, "memory"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "memory", sizeof (vl.plugin)
);
+ s
strncpy (vl.type, "memory", sizeof (vl.type)
);
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
@@
-319,7
+319,7
@@
static int memory_read (void)
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
- memory_submit ("cached", ios->cache
d
);
+ memory_submit ("cached", ios->cache);
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */