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 #3339 from jkohen/patch-1
[collectd.git]
/
src
/
daemon
/
utils_time.c
diff --git
a/src/daemon/utils_time.c
b/src/daemon/utils_time.c
index
ab440ed
..
5dd7d0e
100644
(file)
--- a/
src/daemon/utils_time.c
+++ b/
src/daemon/utils_time.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "utils_time.h"
#ifndef DEFAULT_MOCK_TIME
#include "utils_time.h"
#ifndef DEFAULT_MOCK_TIME
@@
-47,9
+47,7
@@
cdtime_t cdtime(void) /* {{{ */
status = clock_gettime(CLOCK_REALTIME, &ts);
if (status != 0) {
status = clock_gettime(CLOCK_REALTIME, &ts);
if (status != 0) {
- char errbuf[1024];
- ERROR("cdtime: clock_gettime failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("cdtime: clock_gettime failed: %s", STRERRNO);
return 0;
}
return 0;
}
@@
-64,9
+62,7
@@
cdtime_t cdtime(void) /* {{{ */
status = gettimeofday(&tv, /* struct timezone = */ NULL);
if (status != 0) {
status = gettimeofday(&tv, /* struct timezone = */ NULL);
if (status != 0) {
- char errbuf[1024];
- ERROR("cdtime: gettimeofday failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("cdtime: gettimeofday failed: %s", STRERRNO);
return 0;
}
return 0;
}
@@
-85,10
+81,8
@@
static int get_utc_time(cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */
NORMALIZE_TIMESPEC(t_spec);
if (gmtime_r(&t_spec.tv_sec, t_tm) == NULL) {
NORMALIZE_TIMESPEC(t_spec);
if (gmtime_r(&t_spec.tv_sec, t_tm) == NULL) {
- char errbuf[1024];
int status = errno;
int status = errno;
- ERROR("get_utc_time: gmtime_r failed: %s",
- sstrerror(status, errbuf, sizeof(errbuf)));
+ ERROR("get_utc_time: gmtime_r failed: %s", STRERRNO);
return status;
}
return status;
}
@@
-102,10
+96,8
@@
static int get_local_time(cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */
NORMALIZE_TIMESPEC(t_spec);
if (localtime_r(&t_spec.tv_sec, t_tm) == NULL) {
NORMALIZE_TIMESPEC(t_spec);
if (localtime_r(&t_spec.tv_sec, t_tm) == NULL) {
- char errbuf[1024];
int status = errno;
int status = errno;
- ERROR("get_local_time: localtime_r failed: %s",
- sstrerror(status, errbuf, sizeof(errbuf)));
+ ERROR("get_local_time: localtime_r failed: %s", STRERRNO);
return status;
}
return status;
}
@@
-152,9
+144,9
@@
static int format_zone(char *buffer, size_t buffer_size,
} /* }}} int format_zone */
int format_rfc3339(char *buffer, size_t buffer_size, struct tm const *t_tm,
} /* }}} int format_zone */
int format_rfc3339(char *buffer, size_t buffer_size, struct tm const *t_tm,
- long nsec,
_B
ool print_nano, char const *zone) /* {{{ */
+ long nsec,
b
ool print_nano, char const *zone) /* {{{ */
{
{
-
in
t len;
+
size_
t len;
char *pos = buffer;
size_t size_left = buffer_size;
char *pos = buffer;
size_t size_left = buffer_size;
@@
-175,7
+167,7
@@
int format_rfc3339(char *buffer, size_t buffer_size, struct tm const *t_tm,
} /* }}} int format_rfc3339 */
int format_rfc3339_utc(char *buffer, size_t buffer_size, cdtime_t t,
} /* }}} int format_rfc3339 */
int format_rfc3339_utc(char *buffer, size_t buffer_size, cdtime_t t,
-
_B
ool print_nano) /* {{{ */
+
b
ool print_nano) /* {{{ */
{
struct tm t_tm;
long nsec = 0;
{
struct tm t_tm;
long nsec = 0;
@@
-189,7
+181,7
@@
int format_rfc3339_utc(char *buffer, size_t buffer_size, cdtime_t t,
} /* }}} int format_rfc3339_utc */
int format_rfc3339_local(char *buffer, size_t buffer_size, cdtime_t t,
} /* }}} int format_rfc3339_utc */
int format_rfc3339_local(char *buffer, size_t buffer_size, cdtime_t t,
-
_B
ool print_nano) /* {{{ */
+
b
ool print_nano) /* {{{ */
{
struct tm t_tm;
long nsec = 0;
{
struct tm t_tm;
long nsec = 0;