diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2014-07-24 09:20:21 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2014-07-26 08:56:41 +0930 |
| commit | 188ec2fac47289c7b543e9307d61af7fbccde0f5 (patch) | |
| tree | cb0cc61e6d08046b34af9123500f569d72cc8fb4 | |
| parent | 5c345a1e1044f78709621857224f503f985dc5b0 (diff) | |
net: use freeaddrinfo() in _info example.
In fact, almost everyone will want to do this, so include the required
headers in net.h. This makes usage simpler.
Reported-by: Jeremy Visser <jeremy@visser.name>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | ccan/net/_info | 3 | ||||
| -rw-r--r-- | ccan/net/net.c | 3 | ||||
| -rw-r--r-- | ccan/net/net.h | 9 |
3 files changed, 4 insertions, 11 deletions
diff --git a/ccan/net/_info b/ccan/net/_info index 5ac83f95..cfa58f84 100644 --- a/ccan/net/_info +++ b/ccan/net/_info @@ -15,8 +15,6 @@ * * Example: * #include <ccan/net/net.h> - * #include <sys/types.h> - * #include <sys/socket.h> * #include <netinet/in.h> * #include <stdio.h> * #include <err.h> @@ -49,6 +47,7 @@ * fd = net_connect(addr); * if (fd < 0) * err(1, "Failed to connect to %s", dest); + * freeaddrinfo(addr); * * if (getsockname(fd, &u.s, &slen) == 0) * printf("Connected via %s\n", diff --git a/ccan/net/net.c b/ccan/net/net.c index 7867054d..61efd5b8 100644 --- a/ccan/net/net.c +++ b/ccan/net/net.c @@ -1,10 +1,7 @@ /* Licensed under BSD-MIT - see LICENSE file for details */ #include <ccan/net/net.h> #include <ccan/noerr/noerr.h> -#include <sys/types.h> -#include <sys/socket.h> #include <poll.h> -#include <netdb.h> #include <string.h> #include <stdlib.h> #include <unistd.h> diff --git a/ccan/net/net.h b/ccan/net/net.h index 5e02fc36..05d552dc 100644 --- a/ccan/net/net.h +++ b/ccan/net/net.h @@ -1,6 +1,9 @@ /* Licensed under BSD-MIT - see LICENSE file for details */ #ifndef CCAN_NET_H #define CCAN_NET_H +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> #include <stdbool.h> struct pollfd; @@ -16,10 +19,7 @@ struct pollfd; * of results, or NULL on error. You should use freeaddrinfo() to free it. * * Example: - * #include <sys/types.h> - * #include <sys/socket.h> * #include <stdio.h> - * #include <netdb.h> * #include <poll.h> * #include <err.h> * ... @@ -124,10 +124,7 @@ void net_connect_abort(struct pollfd *pfds); * of results, or NULL on error. You should use freeaddrinfo() to free it. * * Example: - * #include <sys/types.h> - * #include <sys/socket.h> * #include <stdio.h> - * #include <netdb.h> * #include <err.h> * ... * struct addrinfo *addr; |