Deleted Added
full compact
inet_ntop.c (156956) inet_ntop.c (170244)
1/*
2 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3 * Copyright (c) 1996-1999 by Internet Software Consortium.
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#if defined(LIBC_SCCS) && !defined(lint)
1/*
2 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3 * Copyright (c) 1996-1999 by Internet Software Consortium.
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#if defined(LIBC_SCCS) && !defined(lint)
19static const char rcsid[] = "$Id: inet_ntop.c,v 1.1.2.1.8.2 2005/11/03 23:08:40 marka Exp $";
19static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
20#endif /* LIBC_SCCS and not lint */
21#include <sys/cdefs.h>
20#endif /* LIBC_SCCS and not lint */
21#include <sys/cdefs.h>
22__FBSDID("$FreeBSD: head/lib/libc/inet/inet_ntop.c 156956 2006-03-21 15:37:16Z ume $");
22__FBSDID("$FreeBSD: head/lib/libc/inet/inet_ntop.c 170244 2007-06-03 17:20:27Z ume $");
23
24#include "port_before.h"
25
26#include <sys/param.h>
27#include <sys/types.h>
28#include <sys/socket.h>
29
30#include <netinet/in.h>
31#include <arpa/inet.h>
32#include <arpa/nameser.h>
33
34#include <errno.h>
35#include <stdio.h>
36#include <string.h>
37
38#include "port_after.h"
39
23
24#include "port_before.h"
25
26#include <sys/param.h>
27#include <sys/types.h>
28#include <sys/socket.h>
29
30#include <netinet/in.h>
31#include <arpa/inet.h>
32#include <arpa/nameser.h>
33
34#include <errno.h>
35#include <stdio.h>
36#include <string.h>
37
38#include "port_after.h"
39
40/*
40/*%
41 * WARNING: Don't even consider trying to compile this on a system where
42 * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
43 */
44
45static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
46static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
47
48/* char *

--- 145 unchanged lines hidden (view full) ---

194}
195
196/*
197 * Weak aliases for applications that use certain private entry points,
198 * and fail to include <arpa/inet.h>.
199 */
200#undef inet_ntop
201__weak_reference(__inet_ntop, inet_ntop);
41 * WARNING: Don't even consider trying to compile this on a system where
42 * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
43 */
44
45static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
46static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
47
48/* char *

--- 145 unchanged lines hidden (view full) ---

194}
195
196/*
197 * Weak aliases for applications that use certain private entry points,
198 * and fail to include <arpa/inet.h>.
199 */
200#undef inet_ntop
201__weak_reference(__inet_ntop, inet_ntop);
202
203/*! \file */