projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
[collectd.git]
/
src
/
utils_cmd_putval.c
diff --git
a/src/utils_cmd_putval.c
b/src/utils_cmd_putval.c
index
7b0258c
..
bf3e2b6
100644
(file)
--- a/
src/utils_cmd_putval.c
+++ b/
src/utils_cmd_putval.c
@@
-25,10
+25,12
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "utils_parse_option.h"
#include "common.h"
#include "plugin.h"
#include "utils_parse_option.h"
+#include "utils_cmd_putval.h"
#define print_to_socket(fh, ...) \
do { \
#define print_to_socket(fh, ...) \
do { \
@@
-162,7
+164,7
@@
int handle_putval (FILE *fh, char *buffer)
sfree (identifier_copy);
vl.values_len = ds->ds_num;
sfree (identifier_copy);
vl.values_len = ds->ds_num;
- vl.values =
(value_t *) malloc (vl.values_len * sizeof (value_t
));
+ vl.values =
malloc (vl.values_len * sizeof (*vl.values
));
if (vl.values == NULL)
{
print_to_socket (fh, "-1 malloc failed.\n");
if (vl.values == NULL)
{
print_to_socket (fh, "-1 malloc failed.\n");
@@
-217,7
+219,8
@@
int handle_putval (FILE *fh, char *buffer)
} /* while (*buffer != 0) */
/* Done parsing the options. */
} /* while (*buffer != 0) */
/* Done parsing the options. */
- print_to_socket (fh, "0 Success: %i %s been dispatched.\n",
+ if (fh!=stdout)
+ print_to_socket (fh, "0 Success: %i %s been dispatched.\n",
values_submitted,
(values_submitted == 1) ? "value has" : "values have");
values_submitted,
(values_submitted == 1) ? "value has" : "values have");