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-5.4' into collectd-5.5
[collectd.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index
cfde4ea
..
e4c5d24
100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-521,10
+521,10
@@
static int swap_read (void) /* {{{ */
return (0);
/* Allocate and initialize the swaptbl_t structure */
return (0);
/* Allocate and initialize the swaptbl_t structure */
- s =
(swaptbl_t *) s
malloc (swap_num * sizeof (swapent_t) + sizeof (struct swaptable));
+ s = malloc (swap_num * sizeof (swapent_t) + sizeof (struct swaptable));
if (s == NULL)
{
if (s == NULL)
{
- ERROR ("swap plugin:
s
malloc failed.");
+ ERROR ("swap plugin: malloc failed.");
return (-1);
}
return (-1);
}
@@
-534,7
+534,7
@@
static int swap_read (void) /* {{{ */
s_paths = calloc (swap_num, PATH_MAX);
if (s_paths == NULL)
{
s_paths = calloc (swap_num, PATH_MAX);
if (s_paths == NULL)
{
- ERROR ("swap plugin:
m
alloc failed.");
+ ERROR ("swap plugin:
c
alloc failed.");
sfree (s);
return (-1);
}
sfree (s);
return (-1);
}