Commit Diff
Diff:
212d99146d4a3681976450b5ff0dfa57e1d2e44f
d56341c77b19b3e1d4cf13c2f95ec1612e8d52c9
Commit:
d56341c77b19b3e1d4cf13c2f95ec1612e8d52c9
Tree:
e8066d93320a792b87a42278600ca035969ad39e
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Tue Aug 20 22:23:47 2013 UTC
Message:
Add some assert() calls to ng_ipaddr library
blob - 1f209ef9fb734ab4ac05b7d488c2a5ea1ebe7c4f
blob + 8f7376001872bbcd3e4d3ef0f45c4981f9c5017c
--- src/ipaddr/ng_ipaddr.h
+++ src/ipaddr/ng_ipaddr.h
@@ -47,6 +47,7 @@ typedef struct NG_IP_ADDR_DONTUSE ng_ipaddr_t;
static inline int
ng_ipaddr_af(const ng_ipaddr_t *a)
{
+ assert(a != NULL);
#ifdef WANT_IPV6
return a->sa.sa_family;
#else
@@ -59,6 +60,7 @@ ng_ipaddr_af(const ng_ipaddr_t *a)
static inline socklen_t
ng_ipaddr_salen(const ng_ipaddr_t *a)
{
+ assert(a != NULL);
#ifdef WANT_IPV6
assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6);
if (a->sa.sa_family == AF_INET6)
@@ -75,11 +77,14 @@ ng_ipaddr_getport(const ng_ipaddr_t *a)
#ifdef WANT_IPV6
int af = a->sa.sa_family;
+ assert(a != NULL);
assert(af == AF_INET || af == AF_INET6);
if (af == AF_INET6)
return ntohs(a->sin6.sin6_port);
#endif /* WANT_IPV6 */
+
+ assert(a != NULL);
assert(a->sin4.sin_family == AF_INET);
return ntohs(a->sin4.sin_port);
}
@@ -109,12 +114,15 @@ GLOBAL bool ng_ipaddr_tostr_r PARAMS((const ng_ipaddr_
static inline const char*
ng_ipaddr_tostr(const ng_ipaddr_t *addr)
{
+ assert(addr != NULL);
return inet_ntoa(addr->sin4.sin_addr);
}
static inline bool
ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d)
{
+ assert(addr != NULL);
+ assert(d != NULL);
strlcpy(d, inet_ntoa(addr->sin4.sin_addr), NG_INET_ADDRSTRLEN);
return true;
}
IRCNow