Sync up nameser with upstream(2014.03.05)
Bug: 13219633 Change-Id: I8ee4ddf270710e9eea415fa3db984af7719a8dd4
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $ */
|
||||
/* $NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
|
||||
@@ -20,9 +20,9 @@
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
#ifdef notdef
|
||||
static const char rcsid[] = "Id: ns_netint.c,v 1.1.206.1 2004/03/09 08:33:44 marka Exp";
|
||||
static const char rcsid[] = "Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp";
|
||||
#else
|
||||
__RCSID("$NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $");
|
||||
__RCSID("$NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -32,28 +32,28 @@ __RCSID("$NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $");
|
||||
|
||||
/* Public. */
|
||||
|
||||
u_int16_t
|
||||
uint16_t
|
||||
ns_get16(const u_char *src) {
|
||||
u_int dst;
|
||||
uint16_t dst;
|
||||
|
||||
NS_GET16(dst, src);
|
||||
return (dst);
|
||||
return dst;
|
||||
}
|
||||
|
||||
u_int32_t
|
||||
uint32_t
|
||||
ns_get32(const u_char *src) {
|
||||
u_long dst;
|
||||
u_int32_t dst;
|
||||
|
||||
NS_GET32(dst, src);
|
||||
return (dst);
|
||||
return dst;
|
||||
}
|
||||
|
||||
void
|
||||
ns_put16(u_int16_t src, u_char *dst) {
|
||||
ns_put16(uint16_t src, u_char *dst) {
|
||||
NS_PUT16(src, dst);
|
||||
}
|
||||
|
||||
void
|
||||
ns_put32(u_int32_t src, u_char *dst) {
|
||||
ns_put32(uint32_t src, u_char *dst) {
|
||||
NS_PUT32(src, dst);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user