diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-02 14:08:18 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-02 14:08:18 +0000 |
| commit | 66142b071a2497d7e3cf58d7bf5159bb1c970d84 (patch) | |
| tree | 1e0125be0373b7201ec71275f4bd8e06aecc94a3 /avahi-common/address.c | |
| parent | 98d4644e8f9445fa4cf7395b05a9f860b8f3cb9c (diff) | |
* allow caller to specifiy additional CFLAGS arguments to bootstrap.sh
* fix some warnings (and some real errors) found when compiling avahi with excessive GCC warnings
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@209 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common/address.c')
| -rw-r--r-- | avahi-common/address.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-common/address.c b/avahi-common/address.c index b982a2c..8f1848e 100644 --- a/avahi-common/address.c +++ b/avahi-common/address.c @@ -142,9 +142,9 @@ AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddres ret_addr->family = sa->sa_family; if (sa->sa_family == AF_INET) - memcpy(&ret_addr->data.ipv4, &((struct sockaddr_in*) sa)->sin_addr, sizeof(ret_addr->data.ipv4)); + memcpy(&ret_addr->data.ipv4, &((const struct sockaddr_in*) sa)->sin_addr, sizeof(ret_addr->data.ipv4)); else - memcpy(&ret_addr->data.ipv6, &((struct sockaddr_in6*) sa)->sin6_addr, sizeof(ret_addr->data.ipv6)); + memcpy(&ret_addr->data.ipv6, &((const struct sockaddr_in6*) sa)->sin6_addr, sizeof(ret_addr->data.ipv6)); return ret_addr; } @@ -155,9 +155,9 @@ guint16 avahi_port_from_sockaddr(const struct sockaddr* sa) { g_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6); if (sa->sa_family == AF_INET) - return ntohs(((struct sockaddr_in*) sa)->sin_port); + return ntohs(((const struct sockaddr_in*) sa)->sin_port); else - return ntohs(((struct sockaddr_in6*) sa)->sin6_port); + return ntohs(((const struct sockaddr_in6*) sa)->sin6_port); } gboolean avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) { |