diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-05 11:04:40 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-05 11:04:40 +0100 |
commit | f37ae8b0f302a089baae50b18195b03c2f789ea4 (patch) | |
tree | d760b055988f14a5d579162e6f105fa983eeb688 /avahi-common/address.c | |
parent | c90c318dbbfa73a00951cdf96c51d13d7b23c44a (diff) | |
parent | c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9 (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
Diffstat (limited to 'avahi-common/address.c')
-rw-r--r-- | avahi-common/address.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/avahi-common/address.c b/avahi-common/address.c index c8ddf7f..270292c 100644 --- a/avahi-common/address.c +++ b/avahi-common/address.c @@ -2,17 +2,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -48,7 +48,7 @@ static size_t address_get_size(const AvahiAddress *a) { int avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b) { assert(a); assert(b); - + if (a->proto != b->proto) return -1; @@ -59,10 +59,10 @@ char *avahi_address_snprint(char *s, size_t length, const AvahiAddress *a) { assert(s); assert(length); assert(a); - + if (!(inet_ntop(avahi_proto_to_af(a->proto), a->data.data, s, length))) return NULL; - + return s; } @@ -119,10 +119,10 @@ AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol proto, AvahiAddre } else { if (inet_pton(avahi_proto_to_af(proto), s, ret_addr->data.data) <= 0) return NULL; - + ret_addr->proto = proto; } - + return ret_addr; } |