summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2009-10-01 23:38:57 +0100
committerNeil Jerram <neil@ossau.uklinux.net>2009-10-01 23:44:21 +0100
commit84a54b292d30e94c6980caf61bc0450ff4ba3ac8 (patch)
tree0598ba7f148072a7fb634201f8f78b6d2eb86947
parent451e15a06c744e49a1bdab6df6d86e0f96d3aa14 (diff)
downloadguile-84a54b292d30e94c6980caf61bc0450ff4ba3ac8.tar.gz
Fix doc for inet-ntop: always produces a string
Thanks to Scott McPeak for reporting this. * libguile/socket.c (scm_inet_ntop): In docstring, add quotes around IPv6 address (+ reflow a bit). * doc/ref/posix.texi (Network Address Conversion): Corresponding change. * doc/maint/guile.texi: Corresponding change.
-rw-r--r--doc/maint/guile.texi4
-rw-r--r--doc/ref/posix.texi4
-rw-r--r--libguile/socket.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/maint/guile.texi b/doc/maint/guile.texi
index 4ef4aab18..3b5305e8e 100644
--- a/doc/maint/guile.texi
+++ b/doc/maint/guile.texi
@@ -10708,8 +10708,8 @@ the input is an integer with normal host byte ordering.
@lisp
(inet-ntop AF_INET 2130706433) @result{} "127.0.0.1"
-(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}
-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+(inet-ntop AF_INET6 (- (expt 2 128) 1))
+ @result{} "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
@end lisp
@end deffn
diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 84ccd035f..0a7e3423b 100644
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -2310,8 +2310,8 @@ Convert a network address from an integer to a printable string.
@lisp
(inet-ntop AF_INET 2130706433) @result{} "127.0.0.1"
-(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}
-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+(inet-ntop AF_INET6 (- (expt 2 128) 1))
+ @result{} "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
@end lisp
@end deffn
diff --git a/libguile/socket.c b/libguile/socket.c
index 22398d185..cb954f4f8 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -397,8 +397,8 @@ SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0,
"@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n"
"@lisp\n"
"(inet-ntop AF_INET 2130706433) @result{} \"127.0.0.1\"\n"
- "(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}\n"
- "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
+ "(inet-ntop AF_INET6 (- (expt 2 128) 1))\n"
+ " @result{} \"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\"\n"
"@end lisp")
#define FUNC_NAME s_scm_inet_ntop
{