Mercurial > hg > octave-lyh > gnulib-hg
changeset 9993:4d5ba95a0dec
Move inet_ntop and inet_pton declarations to arpa/inet.h.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Mon, 28 Apr 2008 17:40:25 +0200 |
parents | 57789763312c |
children | d45f5069548a |
files | ChangeLog lib/arpa_inet.in.h lib/inet_ntop.c lib/inet_ntop.h lib/inet_pton.c lib/inet_pton.h m4/inet_ntop.m4 m4/inet_pton.m4 modules/inet_ntop modules/inet_pton |
diffstat | 10 files changed, 50 insertions(+), 84 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-04-28 Simon Josefsson <simon@josefsson.org> + + * lib/inet_ntop.h, lib/inet_pton.h: Remove files. + + * lib/inet_ntop.c: Include arpa/inet.h instead of inet_ntop.h. + + * lib/inet_pton.c: Include arpa/inet.h instead of inet_pton.h. + + * lib/arpa_inet.in.h [@GNULIB_INET_NTOP@]: Inline inet_ntop.h + declarations. + [@GNULIB_INET_PTON@]: Inline inet_pton.h declarations. + + * m4/inet_pton.m4: Don't check for header files. + + * m4/inet_ntop.m4: Don't check for header files. + 2008-04-28 Simon Josefsson <simon@josefsson.org> * m4/sys_socket_h.m4: Require AC_C_INLINE when necessary.
--- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -23,7 +23,25 @@ #include <sys/socket.h> #if @GNULIB_INET_NTOP@ -# include <inet_ntop.h> +# if !@HAVE_DECL_INET_NTOP@ +/* Converts an internet address from internal format to a printable, + presentable format. + AF is an internet address family, such as AF_INET or AF_INET6. + SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr' + (for AF_INET6). + DST points to a buffer having room for CNT bytes. + The printable representation of the address (in numeric form, not + surrounded by [...], no reverse DNS is done) is placed in DST, and + DST is returned. If an error occurs, the return value is NULL and + errno is set. If CNT bytes are not sufficient to hold the result, + the return value is NULL and errno is set to ENOSPC. A good value + for CNT is 46. + + For more details, see the POSIX:2001 specification + <http://www.opengroup.org/susv3xsh/inet_ntop.html>. */ +extern const char *inet_ntop (int af, const void *restrict src, + char *restrict dst, socklen_t cnt); +# endif #elif defined GNULIB_POSIXCHECK # undef inet_ntop # define inet_ntop(af,src,dst,cnt) \ @@ -33,7 +51,9 @@ #endif #if @GNULIB_INET_PTON@ -# include <inet_pton.h> +# if !@HAVE_DECL_INET_PTON@ +extern int inet_pton (int af, const char *restrict src, void *restrict dst); +# endif #elif defined GNULIB_POSIXCHECK # undef inet_pton # define inet_pton(af,src,dst) \
--- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -1,6 +1,6 @@ /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ #include <config.h> /* Specification. */ -#include "inet_ntop.h" +#include <arpa/inet.h> #include <stdio.h> #include <string.h>
deleted file mode 100644 --- a/lib/inet_ntop.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Convert internet address from internal to printable, presentable format. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -/* Converts an internet address from internal format to a printable, - presentable format. - AF is an internet address family, such as AF_INET or AF_INET6. - SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr' - (for AF_INET6). - DST points to a buffer having room for CNT bytes. - The printable representation of the address (in numeric form, not - surrounded by [...], no reverse DNS is done) is placed in DST, and - DST is returned. If an error occurs, the return value is NULL and - errno is set. If CNT bytes are not sufficient to hold the result, - the return value is NULL and errno is set to ENOSPC. A good value - for CNT is 46. - - For more details, see the POSIX:2001 specification - <http://www.opengroup.org/susv3xsh/inet_ntop.html>. */ - -#if !HAVE_DECL_INET_NTOP -extern const char *inet_ntop (int af, const void *restrict src, - char *restrict dst, socklen_t cnt); -#endif
--- 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 Free Software Foundation, Inc. + Copyright (C) 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ #include <config.h> /* Specification. */ -#include "inet_pton.h" +#include <arpa/inet.h> #include <ctype.h> #include <string.h>
deleted file mode 100644 --- a/lib/inet_pton.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Convert internet address from text to binary format. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -#if !HAVE_DECL_INET_PTON -extern int inet_pton (int af, const char *restrict src, void *restrict dst); -#endif
--- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,5 +1,5 @@ -# inet_ntop.m4 serial 3 -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# inet_ntop.m4 serial 4 +dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,9 +10,8 @@ gl_PREREQ_INET_NTOP ]) -# Prerequisites of lib/inet_ntop.h and lib/inet_ntop.c. +# Prerequisites of lib/inet_ntop.c. AC_DEFUN([gl_PREREQ_INET_NTOP], [ - AC_CHECK_HEADERS_ONCE([netinet/in.h arpa/inet.h]) AC_CHECK_DECLS([inet_ntop],,,[#include <arpa/inet.h>]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([AC_C_RESTRICT])
--- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,5 +1,5 @@ -# inet_pton.m4 serial 2 -dnl Copyright (C) 2006 Free Software Foundation, Inc. +# inet_pton.m4 serial 3 +dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,9 +10,8 @@ gl_PREREQ_INET_PTON ]) -# Prerequisites of lib/inet_pton.h and lib/inet_pton.c. +# Prerequisites of lib/inet_pton.c. AC_DEFUN([gl_PREREQ_INET_PTON], [ - AC_CHECK_HEADERS_ONCE([netinet/in.h arpa/inet.h]) AC_CHECK_DECLS([inet_pton],,,[#include <arpa/inet.h>]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/inet_ntop +++ b/modules/inet_ntop @@ -2,7 +2,6 @@ Convert internet address from internal to printable, presentable format. Files: -lib/inet_ntop.h lib/inet_ntop.c m4/inet_ntop.m4 @@ -22,7 +21,7 @@ LGPLv2+ Include: -"inet_ntop.h" +#include <arpa/inet.h> Maintainer: Yoann Vandoorselaere, glibc