projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: make function static
[collectd.git]
/
src
/
csv.c
diff --git
a/src/csv.c
b/src/csv.c
index
e4c84f7
..
f5126d2
100644
(file)
--- a/
src/csv.c
+++ b/
src/csv.c
@@
-47,7
+47,7
@@
static int value_list_to_string(char *buffer, int buffer_len,
memset(buffer, '\0', buffer_len);
memset(buffer, '\0', buffer_len);
- status = s
s
nprintf(buffer, buffer_len, "%.3f", CDTIME_T_TO_DOUBLE(vl->time));
+ status = snprintf(buffer, buffer_len, "%.3f", CDTIME_T_TO_DOUBLE(vl->time));
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
@@
-62,8
+62,8
@@
static int value_list_to_string(char *buffer, int buffer_len,
}
if (ds->ds[i].type == DS_TYPE_GAUGE) {
}
if (ds->ds[i].type == DS_TYPE_GAUGE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ",%lf",
-
vl->values[i].gauge);
+ status = snprintf(buffer + offset, buffer_len - offset, ",%lf",
+ vl->values[i].gauge);
} else if (store_rates != 0) {
if (rates == NULL)
rates = uc_get_rate(ds, vl);
} else if (store_rates != 0) {
if (rates == NULL)
rates = uc_get_rate(ds, vl);
@@
-72,17
+72,16
@@
static int value_list_to_string(char *buffer, int buffer_len,
"uc_get_rate failed.");
return -1;
}
"uc_get_rate failed.");
return -1;
}
- status =
- ssnprintf(buffer + offset, buffer_len - offset, ",%lf", rates[i]);
+ status = snprintf(buffer + offset, buffer_len - offset, ",%lf", rates[i]);
} else if (ds->ds[i].type == DS_TYPE_COUNTER) {
} else if (ds->ds[i].type == DS_TYPE_COUNTER) {
- status = s
snprintf(buffer + offset, buffer_len - offset, ",%llu"
,
-
vl->values[i].counter);
+ status = s
nprintf(buffer + offset, buffer_len - offset, ",%" PRIu64
,
+
(uint64_t)
vl->values[i].counter);
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ",%" PRIi64,
-
vl->values[i].derive);
+ status = snprintf(buffer + offset, buffer_len - offset, ",%" PRIi64,
+ vl->values[i].derive);
} else if (ds->ds[i].type == DS_TYPE_ABSOLUTE) {
} else if (ds->ds[i].type == DS_TYPE_ABSOLUTE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ",%" PRIu64,
-
vl->values[i].absolute);
+ status = snprintf(buffer + offset, buffer_len - offset, ",%" PRIu64,
+ vl->values[i].absolute);
}
if ((status < 1) || (status >= (buffer_len - offset))) {
}
if ((status < 1) || (status >= (buffer_len - offset))) {
@@
-162,9
+161,7
@@
static int csv_create_file(const char *filename, const data_set_t *ds) {
csv = fopen(filename, "w");
if (csv == NULL) {
csv = fopen(filename, "w");
if (csv == NULL) {
- char errbuf[1024];
- ERROR("csv plugin: fopen (%s) failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("csv plugin: fopen (%s) failed: %s", filename, STRERRNO);
return -1;
}
return -1;
}
@@
-259,9
+256,7
@@
static int csv_write(const data_set_t *ds, const value_list_t *vl,
if (csv_create_file(filename, ds))
return -1;
} else {
if (csv_create_file(filename, ds))
return -1;
} else {
- char errbuf[1024];
- ERROR("stat(%s) failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("stat(%s) failed: %s", filename, STRERRNO);
return -1;
}
} else if (!S_ISREG(statbuf.st_mode)) {
return -1;
}
} else if (!S_ISREG(statbuf.st_mode)) {
@@
-271,9
+266,7
@@
static int csv_write(const data_set_t *ds, const value_list_t *vl,
csv = fopen(filename, "a");
if (csv == NULL) {
csv = fopen(filename, "a");
if (csv == NULL) {
- char errbuf[1024];
- ERROR("csv plugin: fopen (%s) failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("csv plugin: fopen (%s) failed: %s", filename, STRERRNO);
return -1;
}
csv_fd = fileno(csv);
return -1;
}
csv_fd = fileno(csv);
@@
-284,9
+277,7
@@
static int csv_write(const data_set_t *ds, const value_list_t *vl,
status = fcntl(csv_fd, F_SETLK, &fl);
if (status != 0) {
status = fcntl(csv_fd, F_SETLK, &fl);
if (status != 0) {
- char errbuf[1024];
- ERROR("csv plugin: flock (%s) failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("csv plugin: flock (%s) failed: %s", filename, STRERRNO);
fclose(csv);
return -1;
}
fclose(csv);
return -1;
}