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
/
ntpd.c
diff --git
a/src/ntpd.c
b/src/ntpd.c
index
e075a20
..
a009365
100644
(file)
--- a/
src/ntpd.c
+++ b/
src/ntpd.c
@@
-28,6
+28,7
@@
#define _BSD_SOURCE /* For NI_MAXHOST */
#include "collectd.h"
#define _BSD_SOURCE /* For NI_MAXHOST */
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "configfile.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
@@
-347,7
+348,6
@@
static int ntpd_connect (void)
const char *port;
struct addrinfo *ai_list;
const char *port;
struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
int status;
if (sock_descr >= 0)
int status;
if (sock_descr >= 0)
@@
-364,7
+364,7
@@
static int ntpd_connect (void)
port = NTPD_DEFAULT_PORT;
struct addrinfo ai_hints = {
port = NTPD_DEFAULT_PORT;
struct addrinfo ai_hints = {
- .ai_family =
P
F_UNSPEC,
+ .ai_family =
A
F_UNSPEC,
.ai_flags = AI_ADDRCONFIG,
.ai_protocol = IPPROTO_UDP,
.ai_socktype = SOCK_DGRAM
.ai_flags = AI_ADDRCONFIG,
.ai_protocol = IPPROTO_UDP,
.ai_socktype = SOCK_DGRAM
@@
-381,7
+381,7
@@
static int ntpd_connect (void)
return (-1);
}
return (-1);
}
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
/* create our socket descriptor */
if ((sock_descr = socket (ai_ptr->ai_family,
{
/* create our socket descriptor */
if ((sock_descr = socket (ai_ptr->ai_family,
@@
-419,7
+419,6
@@
static int ntpd_receive_response (int *res_items, int *res_size,
struct resp_pkt res;
int status;
int done;
struct resp_pkt res;
int status;
int done;
- int i;
char *items;
size_t items_num;
char *items;
size_t items_num;
@@
-673,7
+672,7
@@
static int ntpd_receive_response (int *res_items, int *res_size,
items_num += pkt_item_num;
*res_data = items;
items_num += pkt_item_num;
*res_data = items;
- for (i = 0; i < pkt_item_num; i++)
+ for (i
nt i
= 0; i < pkt_item_num; i++)
{
/* dst: There are already `*res_items' items with
* res_item_size bytes each in in `*res_data'. Set
{
/* dst: There are already `*res_items' items with
* res_item_size bytes each in in `*res_data'. Set
@@
-902,7
+901,6
@@
static int ntpd_read (void)
gauge_t offset_error;
int status;
gauge_t offset_error;
int status;
- int i;
/* On Linux, if the STA_NANO bit is set in ik->status, then ik->offset
* is is nanoseconds, otherwise it's microseconds. */
/* On Linux, if the STA_NANO bit is set in ik->status, then ik->offset
* is is nanoseconds, otherwise it's microseconds. */
@@
-970,7
+968,7
@@
static int ntpd_read (void)
return (-1);
}
return (-1);
}
- for (i = 0; i < ps_num; i++)
+ for (i
nt i
= 0; i < ps_num; i++)
{
struct info_peer_summary *ptr;
double offset;
{
struct info_peer_summary *ptr;
double offset;