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'.

diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 95ee6a501dabeae32e6540bee352f188bc7cc194..d2730145cf0f39ff53a8f87f0fbb926e8e819541 100644 (file)
--- 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 62b25d889bf5ee5809ebb206b3fbdb7b1c40878e..f589cfbf705636aa05243d01a075b1b34c2eb6b2 100644 (file)
--- 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

diff --git a/libguile/socket.h b/libguile/socket.h
index d7c368a22239f0638b6f8156aa16eb33c6ae2f9d..53db2c02d54636e41f5417fbd4c4c52e81da47a9 100644 (file)
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -3,7 +3,7 @@
 #ifndef SCM_SOCKET_H
 #define SCM_SOCKET_H
 
-/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008, 2014, 2019 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -27,8 +27,6 @@
 
 \f
 
-SCM_API SCM scm_inet_aton (SCM address);
-SCM_API SCM scm_inet_ntoa (SCM inetid);
 SCM_API SCM scm_inet_netof (SCM address);
 SCM_API SCM scm_lnaof (SCM address);
 SCM_API SCM scm_inet_makeaddr (SCM net, SCM lna);

diff --git a/module/system/repl/server.scm b/module/system/repl/server.scm
index e6c18962f60812c197e0bf5f9609dfd3b50e1e33..d733939c022fa5f94b4ac14ff9f68a2edc86c19c 100644 (file)
--- a/module/system/repl/server.scm
+++ b/module/system/repl/server.scm
@@ -1,6 +1,6 @@
 ;;; Repl server
 
-;; Copyright (C)  2003, 2010, 2011, 2014, 2016 Free Software Foundation, Inc.
+;; Copyright (C)  2003, 2010, 2011, 2014, 2016, 2019 Free Software Foundation, Inc.
 
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,9 @@
 
 (define* (make-tcp-server-socket #:key
                           (host #f)
-                          (addr (if host (inet-aton host) INADDR_LOOPBACK))
+                          (addr (if host
+                                    (inet-pton AF_INET host)
+                                    INADDR_LOOPBACK))
                           (port 37146))
   (let ((sock (socket PF_INET SOCK_STREAM 0)))
     (setsockopt sock SOL_SOCKET SO_REUSEADDR 1)