projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Wshadow' into collectd-5.4
[collectd.git]
/
src
/
ntpd.c
diff --git
a/src/ntpd.c
b/src/ntpd.c
index
a8f6c31
..
67fff22
100644
(file)
--- a/
src/ntpd.c
+++ b/
src/ntpd.c
@@
-19,6
+19,7
@@
* Florian octo Forster <octo at collectd.org>
**/
* Florian octo Forster <octo at collectd.org>
**/
+#define _DEFAULT_SOURCE
#define _BSD_SOURCE /* For NI_MAXHOST */
#include "collectd.h"
#define _BSD_SOURCE /* For NI_MAXHOST */
#include "collectd.h"
@@
-481,7
+482,7
@@
static int ntpd_receive_response (int *res_items, int *res_size,
poll_s.fd = sd;
poll_s.events = POLLIN | POLLPRI;
poll_s.revents = 0;
poll_s.fd = sd;
poll_s.events = POLLIN | POLLPRI;
poll_s.revents = 0;
-
+
DEBUG ("Polling for %ims", timeout);
status = poll (&poll_s, 1, timeout);
DEBUG ("Polling for %ims", timeout);
status = poll (&poll_s, 1, timeout);
@@
-521,7
+522,7
@@
static int ntpd_receive_response (int *res_items, int *res_size,
DEBUG ("recv'd %i bytes", status);
DEBUG ("recv'd %i bytes", status);
- /*
+ /*
* Do some sanity checks first
*/
if (status < RESP_HEADER_SIZE)
* Do some sanity checks first
*/
if (status < RESP_HEADER_SIZE)
@@
-730,7
+731,7
@@
static int ntpd_send_request (int req_code, int req_items, int req_size, char *r
req.err_nitems = ERR_NITEMS (0, req_items);
req.mbz_itemsize = MBZ_ITEMSIZE (req_size);
req.err_nitems = ERR_NITEMS (0, req_items);
req.mbz_itemsize = MBZ_ITEMSIZE (req_size);
-
+
if (req_data != NULL)
memcpy ((void *) req.data, (const void *) req_data, req_data_len);
if (req_data != NULL)
memcpy ((void *) req.data, (const void *) req_data, req_data_len);