lib/configuration.c, lib/home.c: Introduce environment variables.

[disorder] / lib / addr.h

diff --git a/lib/addr.h b/lib/addr.h
index fb7006817c5d690e2ef4f629ccdfbe4b4bdfd2c8..c0e82b04ec0713ec8356355fbc12aeddc6e5b97c 100644 (file)
--- a/lib/addr.h
+++ b/lib/addr.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008, 2013 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -21,7 +21,9 @@
 #ifndef ADDR_H
 #define ADDR_H
 
 #ifndef ADDR_H
 #define ADDR_H
 

-#include <netdb.h>
+#if HAVE_NETDB_H
+# include <netdb.h>
+#endif

 
 struct stringlist;
 
 
 struct stringlist;
 


@@ -43,23 +45,27 @@ struct netaddress {
 
 struct addrinfo *get_address(const struct stringlist *a,
                             const struct addrinfo *pref,
 
 struct addrinfo *get_address(const struct stringlist *a,
                             const struct addrinfo *pref,

-                            char **namep);
+                            char **namep)
+  attribute((nonnull (1)));

 
 int addrinfocmp(const struct addrinfo *a,
 
 int addrinfocmp(const struct addrinfo *a,

-               const struct addrinfo *b);
+               const struct addrinfo *b) attribute((nonnull (1, 2)));
+int sockaddrcmp(const struct sockaddr *a,
+               const struct sockaddr *b) attribute((nonnull (1, 2)));

 
 

-int multicast(const struct sockaddr *sa);
-char *format_sockaddr(const struct sockaddr *sa);
+int multicast(const struct sockaddr *sa) attribute((nonnull (1)));
+char *format_sockaddr(const struct sockaddr *sa) attribute((nonnull (1)));

 
 int netaddress_parse(struct netaddress *na,
                     int nvec,
 
 int netaddress_parse(struct netaddress *na,
                     int nvec,

-                    char **vec);
+                    char **vec) attribute((nonnull (1)));

 void netaddress_format(const struct netaddress *na,
                       int *nvecp,
 void netaddress_format(const struct netaddress *na,
                       int *nvecp,

-                      char ***vecp);
+                      char ***vecp) attribute((nonnull (1)));

 struct addrinfo *netaddress_resolve(const struct netaddress *na,
                                    int passive,
 struct addrinfo *netaddress_resolve(const struct netaddress *na,
                                    int passive,

-                                   int protocol);
+                                   int protocol) attribute((nonnull (1)));
+void netaddress_freeaddrinfo(struct addrinfo *res) attribute((nonnull (1)));

 
 #endif /* ADDR_H */
 
 
 #endif /* ADDR_H */