From f4f9d177f0a43f6a846414d34b6839a1b9b3319b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Jun 2019 15:10:13 +0200 Subject: Remove references to 'inet-ntoa' and 'inet-aton'. These procedures were removed in Guile 2.2 by commit fc7bd367ab4b5027a7f80686b1e229c62e43c90b (May 2011). * libguile/socket.h (scm_inet_aton, scm_inet_ntoa): Remove. * module/system/repl/server.scm (make-tcp-server-socket): Use 'inet-pton' instead of 'inet-aton'. * doc/ref/web.texi (HTTP): Likewise in 'declare-header!' example. * doc/ref/posix.texi (Network Address Conversion): Remove documentation of 'inet-ntoa' and 'inet-aton'. --- doc/ref/posix.texi | 24 ------------------------ doc/ref/web.texi | 6 +++--- 2 files changed, 3 insertions(+), 27 deletions(-) (limited to 'doc') diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi index 95ee6a501..d2730145c 100644 --- a/doc/ref/posix.texi +++ b/doc/ref/posix.texi @@ -2420,30 +2420,6 @@ The address of the local host using the loopback device, ie.@: @c No address. @c @end defvar -@deffn {Scheme Procedure} inet-aton address -@deffnx {C Function} scm_inet_aton (address) -This function is deprecated in favor of @code{inet-pton}. - -Convert an IPv4 Internet address from printable string -(dotted decimal notation) to an integer. E.g., - -@lisp -(inet-aton "127.0.0.1") @result{} 2130706433 -@end lisp -@end deffn - -@deffn {Scheme Procedure} inet-ntoa inetid -@deffnx {C Function} scm_inet_ntoa (inetid) -This function is deprecated in favor of @code{inet-ntop}. - -Convert an IPv4 Internet address to a printable -(dotted decimal notation) string. E.g., - -@lisp -(inet-ntoa 2130706433) @result{} "127.0.0.1" -@end lisp -@end deffn - @deffn {Scheme Procedure} inet-netof address @deffnx {C Function} scm_inet_netof (address) Return the network number part of the given IPv4 diff --git a/doc/ref/web.texi b/doc/ref/web.texi index 62b25d889..f589cfbf7 100644 --- a/doc/ref/web.texi +++ b/doc/ref/web.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 2010, 2011, 2012, 2013, 2015, 2018 Free Software Foundation, Inc. +@c Copyright (C) 2010, 2011, 2012, 2013, 2015, 2018, 2019 Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @node Web @@ -458,11 +458,11 @@ HTTP stack like this: @example (declare-header! "X-Client-Address" (lambda (str) - (inet-aton str)) + (inet-pton AF_INET str)) (lambda (ip) (and (integer? ip) (exact? ip) (<= 0 ip #xffffffff))) (lambda (ip port) - (display (inet-ntoa ip) port))) + (display (inet-ntop AF_INET ip) port))) @end example @deffn {Scheme Procedure} declare-opaque-header! name -- cgit v1.2.3