X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Folsrd.c;h=df052889e0d2e63bf2a04fc31c099fc6db0ed89f;hp=1ac1d42610d92ae3f145d2fca94ce0e0305a6da5;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=88bd89f106abd5c0a9f9a80246e31a16c36a3c6d diff --git a/src/olsrd.c b/src/olsrd.c index 1ac1d426..df052889 100644 --- a/src/olsrd.c +++ b/src/olsrd.c @@ -41,8 +41,8 @@ static const char *config_keys[] = {"Host", "Port", "CollectLinks", "CollectRoutes", "CollectTopology"}; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static char *config_node = NULL; -static char *config_service = NULL; +static char *config_node; +static char *config_service; #define OLSRD_WANT_NOT 0 #define OLSRD_WANT_SUMMARY 1 @@ -162,19 +162,16 @@ static FILE *olsrd_connect(void) /* {{{ */ ai_ptr = ai_ptr->ai_next) { int fd; int status; - char errbuf[1024]; fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); if (fd < 0) { - ERROR("olsrd plugin: socket failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("olsrd plugin: socket failed: %s", STRERRNO); continue; } status = connect(fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen); if (status != 0) { - ERROR("olsrd plugin: connect failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("olsrd plugin: connect failed: %s", STRERRNO); close(fd); continue; }