diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
commit | 855db1905d56efcdf91ae51a9e80990f79030eae (patch) | |
tree | 9c918dba899ddae458147ce1095018fcbdec18b0 /lib/inet_pton.c | |
parent | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (diff) | |
parent | 9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a (diff) | |
download | guile-855db1905d56efcdf91ae51a9e80990f79030eae.tar.gz |
Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'
Conflicts:
libguile/foreign.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
Diffstat (limited to 'lib/inet_pton.c')
-rw-r--r-- | lib/inet_pton.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/inet_pton.c b/lib/inet_pton.c index 83ac40d47..36e981a3e 100644 --- a/lib/inet_pton.c +++ b/lib/inet_pton.c @@ -1,6 +1,6 @@ /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form - Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -73,8 +73,8 @@ static int inet_pton6 (const char *src, unsigned char *dst); * to network format (which is usually some kind of binary format). * return: * 1 if the address was valid for the specified address family - * 0 if the address wasn't valid (`dst' is untouched in this case) - * -1 if some other error occurred (`dst' is untouched in this case, too) + * 0 if the address wasn't valid ('dst' is untouched in this case) + * -1 if some other error occurred ('dst' is untouched in this case, too) * author: * Paul Vixie, 1996. */ @@ -103,9 +103,9 @@ inet_pton (int af, const char *restrict src, void *restrict dst) * like inet_aton() but without all the hexadecimal, octal (with the * exception of 0) and shorthand. * return: - * 1 if `src' is a valid dotted quad, else 0. + * 1 if 'src' is a valid dotted quad, else 0. * notice: - * does not touch `dst' unless it's returning 1. + * does not touch 'dst' unless it's returning 1. * author: * Paul Vixie, 1996. */ @@ -159,9 +159,9 @@ inet_pton4 (const char *restrict src, unsigned char *restrict dst) * inet_pton6(src, dst) * convert presentation level address to network order binary form. * return: - * 1 if `src' is a valid [RFC1884 2.2] address, else 0. + * 1 if 'src' is a valid [RFC1884 2.2] address, else 0. * notice: - * (1) does not touch `dst' unless it's returning 1. + * (1) does not touch 'dst' unless it's returning 1. * (2) :: in a full address is silently ignored. * credit: * inspired by Mark Andrews. |