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 #1842 from rubenk/declare-loop-variable-in-for-loop-controlling...
[collectd.git]
/
src
/
olsrd.c
diff --git
a/src/olsrd.c
b/src/olsrd.c
index
976793f
..
899ad3e
100644
(file)
--- a/
src/olsrd.c
+++ b/
src/olsrd.c
@@
-25,6
+25,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-149,15
+150,13
@@
static size_t strtabsplit (char *string, char **fields, size_t size) /* {{{ */
static FILE *olsrd_connect (void) /* {{{ */
{
static FILE *olsrd_connect (void) /* {{{ */
{
- struct addrinfo *ai_list
, *ai_ptr
;
+ struct addrinfo *ai_list;
int ai_return;
FILE *fh;
int ai_return;
FILE *fh;
- ai_list = NULL;
-
struct addrinfo ai_hints = {
struct addrinfo ai_hints = {
- .ai_family =
P
F_UNSPEC,
+ .ai_family =
A
F_UNSPEC,
.ai_flags = AI_ADDRCONFIG,
.ai_protocol = IPPROTO_TCP,
.ai_socktype = SOCK_STREAM
.ai_flags = AI_ADDRCONFIG,
.ai_protocol = IPPROTO_TCP,
.ai_socktype = SOCK_STREAM
@@
-174,7
+173,7
@@
static FILE *olsrd_connect (void) /* {{{ */
}
fh = NULL;
}
fh = NULL;
- 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)
{
int fd;
int status;
{
int fd;
int status;