svn commit: r330864 - in head/stand: common efi/boot1 efi/loader/arch/arm ficl/aarch64 ficl/amd64 ficl/arm ficl/i386 ficl/mips ficl/mips64 ficl/powerpc ficl/riscv ficl/sparc64 i386/btx/lib i386/lib...

Warner Losh imp at FreeBSD.org
Tue Mar 13 16:33:05 UTC 2018 

Author: imp
Date: Tue Mar 13 16:33:00 2018
New Revision: 330864
URL: https://svnweb.freebsd.org/changeset/base/330864

Log:
  Prefer uintXX_t to u_intXX_t
  
  A foolish consistency is the hobgoblin of little minds, adored by
  little statesmen and philosophers and divines. With consistency a
  great soul has simply nothing to do. -- Ralph Waldo Emerson

Modified:
  head/stand/common/bootstrap.h
  head/stand/common/isapnp.c
  head/stand/common/load_elf.c
  head/stand/common/load_elf_obj.c
  head/stand/common/metadata.c
  head/stand/common/misc.c
  head/stand/common/pnp.c
  head/stand/efi/boot1/ufs_module.c
  head/stand/efi/loader/arch/arm/exec.c
  head/stand/ficl/aarch64/sysdep.c
  head/stand/ficl/amd64/sysdep.c
  head/stand/ficl/arm/sysdep.c
  head/stand/ficl/i386/sysdep.c
  head/stand/ficl/mips/sysdep.c
  head/stand/ficl/mips64/sysdep.c
  head/stand/ficl/powerpc/sysdep.c
  head/stand/ficl/riscv/sysdep.c
  head/stand/ficl/sparc64/sysdep.c
  head/stand/i386/btx/lib/btxv86.h
  head/stand/i386/libi386/biosacpi.c
  head/stand/i386/libi386/biosdisk.c
  head/stand/i386/libi386/biospnp.c
  head/stand/i386/libi386/bootinfo32.c
  head/stand/i386/libi386/bootinfo64.c
  head/stand/i386/libi386/elf64_freebsd.c
  head/stand/i386/libi386/multiboot.c
  head/stand/i386/libi386/pxe.c
  head/stand/i386/loader/main.c
  head/stand/libsa/arp.c
  head/stand/libsa/bootp.c
  head/stand/libsa/bootparam.c
  head/stand/libsa/dosfs.h
  head/stand/libsa/ext2fs.c
  head/stand/libsa/net.h
  head/stand/libsa/rpc.c
  head/stand/ofw/libofw/openfirm.c
  head/stand/powerpc/boot1.chrp/boot1.c
  head/stand/powerpc/kboot/ppc64_elf_freebsd.c
  head/stand/powerpc/ofw/elf_freebsd.c
  head/stand/powerpc/ofw/main.c
  head/stand/powerpc/ofw/ppc64_elf_freebsd.c
  head/stand/sparc64/boot1/boot1.c
  head/stand/sparc64/loader/main.c
  head/stand/uboot/lib/elf_freebsd.c
  head/stand/userboot/userboot/bootinfo32.c
  head/stand/userboot/userboot/bootinfo64.c
  head/stand/userboot/userboot/elf64_freebsd.c

Modified: head/stand/common/bootstrap.h
==============================================================================
--- head/stand/common/bootstrap.h	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/bootstrap.h	Tue Mar 13 16:33:00 2018	(r330864)
@@ -150,7 +150,7 @@ void			pnp_addident(struct pnpinfo *pi, char *ident);
 struct pnpinfo		*pnp_allocinfo(void);
 void			pnp_freeinfo(struct pnpinfo *pi);
 void			pnp_addinfo(struct pnpinfo *pi);
-char			*pnp_eisaformat(u_int8_t *data);
+char			*pnp_eisaformat(uint8_t *data);
 
 /*
  *  < 0	- No ISA in system
@@ -168,7 +168,7 @@ extern int			isapnp_readport;
 struct file_metadata 
 {
     size_t			md_size;
-    u_int16_t			md_type;
+    uint16_t			md_type;
     struct file_metadata	*md_next;
     char			md_data[1];	/* data are immediately appended */
 };
@@ -210,7 +210,7 @@ struct preloaded_file
 struct file_format
 {
     /* Load function must return EFTYPE if it can't handle the module supplied */
-    int		(* l_load)(char *filename, u_int64_t dest, struct preloaded_file **result);
+    int		(* l_load)(char *filename, uint64_t dest, struct preloaded_file **result);
     /* Only a loader that will load a kernel (first module) should have an exec handler */
     int		(* l_exec)(struct preloaded_file *mp);
 };
@@ -239,20 +239,20 @@ void file_removemetadata(struct preloaded_file *fp);
 #define ELF_RELOC_RELA	2
 
 /* Relocation offset for some architectures */
-extern u_int64_t __elfN(relocation_offset);
+extern uint64_t __elfN(relocation_offset);
 
 struct elf_file;
 typedef Elf_Addr (symaddr_fn)(struct elf_file *ef, Elf_Size symidx);
 
-int	__elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result);
-int	__elfN(obj_loadfile)(char *filename, u_int64_t dest,
+int	__elfN(loadfile)(char *filename, uint64_t dest, struct preloaded_file **result);
+int	__elfN(obj_loadfile)(char *filename, uint64_t dest,
 	    struct preloaded_file **result);
 int	__elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr,
 	    const void *reldata, int reltype, Elf_Addr relbase,
 	    Elf_Addr dataaddr, void *data, size_t len);
-int __elfN(loadfile_raw)(char *filename, u_int64_t dest,
+int __elfN(loadfile_raw)(char *filename, uint64_t dest,
 	    struct preloaded_file **result, int multiboot);
-int __elfN(load_modmetadata)(struct preloaded_file *fp, u_int64_t dest);
+int __elfN(load_modmetadata)(struct preloaded_file *fp, uint64_t dest);
 #endif
 
 /*

Modified: head/stand/common/isapnp.c
==============================================================================
--- head/stand/common/isapnp.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/isapnp.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 static void	isapnp_write(int d, int r);
 static void	isapnp_send_Initiation_LFSR(void);
-static int	isapnp_get_serial(u_int8_t *p);
+static int	isapnp_get_serial(uint8_t *p);
 static int	isapnp_isolation_protocol(void);
 static void	isapnp_enumerate(void);
 
@@ -90,7 +90,7 @@ isapnp_send_Initiation_LFSR(void)
  * Get the device's serial number.  Returns 1 if the serial is valid.
  */
 static int
-isapnp_get_serial(u_int8_t *data)
+isapnp_get_serial(uint8_t *data)
 {
     int		i, bit, valid = 0, sum = 0x6a;
 
@@ -123,7 +123,7 @@ isapnp_get_serial(u_int8_t *data)
  * Returns nonzero if the device fails to report
  */
 static int
-isapnp_get_resource_info(u_int8_t *buffer, int len)
+isapnp_get_resource_info(uint8_t *buffer, int len)
 {
     int		i, j;
     u_char	temp;
@@ -229,7 +229,7 @@ isapnp_isolation_protocol(void)
 {
     int			csn;
     struct pnpinfo	*pi;
-    u_int8_t		cardid[_PNP_ID_LEN];
+    uint8_t		cardid[_PNP_ID_LEN];
     int			ndevs;
 
     isapnp_send_Initiation_LFSR();

Modified: head/stand/common/load_elf.c
==============================================================================
--- head/stand/common/load_elf.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/load_elf.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -70,11 +70,11 @@ typedef struct elf_file {
 	caddr_t	firstpage;
 	size_t	firstlen;
 	int		kernel;
-	u_int64_t	off;
+	uint64_t	off;
 } *elf_file_t;
 
 static int __elfN(loadimage)(struct preloaded_file *mp, elf_file_t ef,
-    u_int64_t loadaddr);
+    uint64_t loadaddr);
 static int __elfN(lookup_symbol)(struct preloaded_file *mp, elf_file_t ef,
     const char* name, Elf_Sym* sym);
 static int __elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef,
@@ -87,7 +87,7 @@ static char	*fake_modname(const char *name);
 const char	*__elfN(kerneltype) = "elf kernel";
 const char	*__elfN(moduletype) = "elf module";
 
-u_int64_t	__elfN(relocation_offset) = 0;
+uint64_t	__elfN(relocation_offset) = 0;
 
 extern void elf_wrong_field_size(void);
 #define CONVERT_FIELD(b, f, e)			\
@@ -265,13 +265,13 @@ error:
  * will be saved in (result).
  */
 int
-__elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result)
+__elfN(loadfile)(char *filename, uint64_t dest, struct preloaded_file **result)
 {
 	return (__elfN(loadfile_raw)(filename, dest, result, 0));
 }
 
 int
-__elfN(loadfile_raw)(char *filename, u_int64_t dest,
+__elfN(loadfile_raw)(char *filename, uint64_t dest,
     struct preloaded_file **result, int multiboot)
 {
 	struct preloaded_file	*fp, *kfp;
@@ -419,7 +419,7 @@ out:
  * the Elf header, load the image at (off)
  */
 static int
-__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off)
+__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
 {
 	int		i;
 	u_int		j;
@@ -883,21 +883,21 @@ fake_modname(const char *name)
 struct mod_metadata64 {
 	int		md_version;	/* structure version MDTV_* */
 	int		md_type;	/* type of entry MDT_* */
-	u_int64_t	md_data;	/* specific data */
-	u_int64_t	md_cval;	/* common string label */
+	uint64_t	md_data;	/* specific data */
+	uint64_t	md_cval;	/* common string label */
 };
 #endif
 #if defined(__amd64__) && __ELF_WORD_SIZE == 32
 struct mod_metadata32 {
 	int		md_version;	/* structure version MDTV_* */
 	int		md_type;	/* type of entry MDT_* */
-	u_int32_t	md_data;	/* specific data */
-	u_int32_t	md_cval;	/* common string label */
+	uint32_t	md_data;	/* specific data */
+	uint32_t	md_cval;	/* common string label */
 };
 #endif
 
 int
-__elfN(load_modmetadata)(struct preloaded_file *fp, u_int64_t dest)
+__elfN(load_modmetadata)(struct preloaded_file *fp, uint64_t dest)
 {
 	struct elf_file		 ef;
 	int			 err, i, j;

Modified: head/stand/common/load_elf_obj.c
==============================================================================
--- head/stand/common/load_elf_obj.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/load_elf_obj.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -63,7 +63,7 @@ typedef struct elf_file {
 } *elf_file_t;
 
 static int __elfN(obj_loadimage)(struct preloaded_file *mp, elf_file_t ef,
-    u_int64_t loadaddr);
+    uint64_t loadaddr);
 static int __elfN(obj_lookup_set)(struct preloaded_file *mp, elf_file_t ef,
     const char *name, Elf_Addr *startp, Elf_Addr *stopp, int *countp);
 static int __elfN(obj_reloc_ptr)(struct preloaded_file *mp, elf_file_t ef,
@@ -81,7 +81,7 @@ const char	*__elfN(obj_moduletype) = "elf obj module";
  * will be saved in (result).
  */
 int
-__elfN(obj_loadfile)(char *filename, u_int64_t dest,
+__elfN(obj_loadfile)(char *filename, uint64_t dest,
     struct preloaded_file **result)
 {
 	struct preloaded_file *fp, *kfp;
@@ -186,7 +186,7 @@ out:
  * the Elf header, load the image at (off)
  */
 static int
-__elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off)
+__elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
 {
 	Elf_Ehdr *hdr;
 	Elf_Shdr *shdr, *cshdr, *lshdr;
@@ -349,8 +349,8 @@ out:
 struct mod_metadata64 {
 	int		md_version;	/* structure version MDTV_* */
 	int		md_type;	/* type of entry MDT_* */
-	u_int64_t	md_data;	/* specific data */
-	u_int64_t	md_cval;	/* common string label */
+	uint64_t	md_data;	/* specific data */
+	uint64_t	md_cval;	/* common string label */
 };
 #endif
 

Modified: head/stand/common/metadata.c
==============================================================================
--- head/stand/common/metadata.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/metadata.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -217,7 +217,7 @@ md_copyenv(vm_offset_t addr)
 static int align;
 
 #define COPY32(v, a, c) {			\
-    u_int32_t	x = (v);			\
+    uint32_t	x = (v);			\
     if (c)					\
         archsw.arch_copyin(&x, a, sizeof(x));	\
     a += sizeof(x);				\

Modified: head/stand/common/misc.c
==============================================================================
--- head/stand/common/misc.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/misc.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -185,7 +185,7 @@ hexdump(caddr_t region, size_t len)
 	
 	for (x = 0; x < 16; x++) {
 	    if ((line + x) < (region + len)) {
-		emit("%02x ", *(u_int8_t *)(line + x));
+		emit("%02x ", *(uint8_t *)(line + x));
 	    } else {
 		emit("-- ");
 	    }
@@ -195,7 +195,7 @@ hexdump(caddr_t region, size_t len)
 	emit(" |");
 	for (x = 0; x < 16; x++) {
 	    if ((line + x) < (region + len)) {
-		c = *(u_int8_t *)(line + x);
+		c = *(uint8_t *)(line + x);
 		if ((c < ' ') || (c > '~'))	/* !isprint(c) */
 		    c = '.';
 		emit("%c", c);

Modified: head/stand/common/pnp.c
==============================================================================
--- head/stand/common/pnp.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/common/pnp.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -169,7 +169,7 @@ pnp_addinfo(struct pnpinfo *pi)
  * where 'AAA' is the EISA vendor ID, II is the product ID and RR the revision ID.
  */
 char *
-pnp_eisaformat(u_int8_t *data)
+pnp_eisaformat(uint8_t *data)
 {
     static char	idbuf[8];
     const char	hextoascii[] = "0123456789abcdef";

Modified: head/stand/efi/boot1/ufs_module.c
==============================================================================
--- head/stand/efi/boot1/ufs_module.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/efi/boot1/ufs_module.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -44,7 +44,7 @@ static dev_info_t *devinfo;
 static dev_info_t *devices;
 
 static int
-dskread(void *buf, u_int64_t lba, int nblk)
+dskread(void *buf, uint64_t lba, int nblk)
 {
 	int size;
 	EFI_STATUS status;

Modified: head/stand/efi/loader/arch/arm/exec.c
==============================================================================
--- head/stand/efi/loader/arch/arm/exec.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/efi/loader/arch/arm/exec.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -47,7 +47,7 @@ extern vm_offset_t md_load(char *, vm_offset_t *);
 extern int bi_load(char *, vm_offset_t *, vm_offset_t *);
 
 static int
-__elfN(arm_load)(char *filename, u_int64_t dest,
+__elfN(arm_load)(char *filename, uint64_t dest,
     struct preloaded_file **result)
 {
 	int r;

Modified: head/stand/ficl/aarch64/sysdep.c
==============================================================================
--- head/stand/ficl/aarch64/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/aarch64/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/amd64/sysdep.c
==============================================================================
--- head/stand/ficl/amd64/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/amd64/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/arm/sysdep.c
==============================================================================
--- head/stand/ficl/arm/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/arm/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/i386/sysdep.c
==============================================================================
--- head/stand/ficl/i386/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/i386/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -28,12 +28,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -41,7 +41,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;
@@ -89,7 +89,7 @@ void
 ficlOutb(FICL_VM *pVM)
 {
 	u_char c;
-	u_int32_t port;
+	uint32_t port;
 
 	port=stackPopUNS(pVM->pStack);
 	c=(u_char)stackPopINT(pVM->pStack);
@@ -104,7 +104,7 @@ void
 ficlInb(FICL_VM *pVM)
 {
 	u_char c;
-	u_int32_t port;
+	uint32_t port;
 
 	port=stackPopUNS(pVM->pStack);
 	c=inb(port);

Modified: head/stand/ficl/mips/sysdep.c
==============================================================================
--- head/stand/ficl/mips/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/mips/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/mips64/sysdep.c
==============================================================================
--- head/stand/ficl/mips64/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/mips64/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/powerpc/sysdep.c
==============================================================================
--- head/stand/ficl/powerpc/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/powerpc/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/riscv/sysdep.c
==============================================================================
--- head/stand/ficl/riscv/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/riscv/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/ficl/sparc64/sysdep.c
==============================================================================
--- head/stand/ficl/sparc64/sysdep.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/ficl/sparc64/sysdep.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -25,12 +25,12 @@
 DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 {
     DPUNS q;
-    u_int64_t qx;
+    uint64_t qx;
 
-    qx = (u_int64_t)x * (u_int64_t) y;
+    qx = (uint64_t)x * (uint64_t) y;
 
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
+    q.hi = (uint32_t)( qx >> 32 );
+    q.lo = (uint32_t)( qx & 0xFFFFFFFFL);
 
     return q;
 }
@@ -38,7 +38,7 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
 UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
 {
     UNSQR result;
-    u_int64_t qx, qh;
+    uint64_t qx, qh;
 
     qh = q.hi;
     qx = (qh << 32) | q.lo;

Modified: head/stand/i386/btx/lib/btxv86.h
==============================================================================
--- head/stand/i386/btx/lib/btxv86.h	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/btx/lib/btxv86.h	Tue Mar 13 16:33:00 2018	(r330864)
@@ -58,13 +58,13 @@ void __v86int(void);
 #define v86	__v86
 #define v86int	__v86int
 
-extern u_int32_t	__base;
-extern u_int32_t	__args;
+extern uint32_t		__base;
+extern uint32_t		__args;
 
 #define	PTOV(pa)	((caddr_t)(pa) - __base)
 #define	VTOP(va)	((vm_offset_t)(va) + __base)
-#define	VTOPSEG(va)	(u_int16_t)(VTOP((caddr_t)va) >> 4)
-#define	VTOPOFF(va)	(u_int16_t)(VTOP((caddr_t)va) & 0xf)
+#define	VTOPSEG(va)	(uint16_t)(VTOP((caddr_t)va) >> 4)
+#define	VTOPOFF(va)	(uint16_t)(VTOP((caddr_t)va) & 0xf)
 
 #define	V86_CY(x)	((x) & PSL_C)
 #define	V86_ZR(x)	((x) & PSL_Z)

Modified: head/stand/i386/libi386/biosacpi.c
==============================================================================
--- head/stand/i386/libi386/biosacpi.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/biosacpi.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -122,7 +122,7 @@ static ACPI_TABLE_RSDP *
 biosacpi_search_rsdp(char *base, int length)
 {
     ACPI_TABLE_RSDP	*rsdp;
-    u_int8_t		*cp, sum;
+    uint8_t		*cp, sum;
     int			ofs, idx;
 
     /* search on 16-byte boundaries */
@@ -131,7 +131,7 @@ biosacpi_search_rsdp(char *base, int length)
 
 	/* compare signature, validate checksum */
 	if (!strncmp(rsdp->Signature, ACPI_SIG_RSDP, strlen(ACPI_SIG_RSDP))) {
-	    cp = (u_int8_t *)rsdp;
+	    cp = (uint8_t *)rsdp;
 	    sum = 0;
 	    for (idx = 0; idx < RSDP_CHECKSUM_LENGTH; idx++)
 		sum += *(cp + idx);

Modified: head/stand/i386/libi386/biosdisk.c
==============================================================================
--- head/stand/i386/libi386/biosdisk.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/biosdisk.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -916,7 +916,7 @@ bd_write(struct disk_devdesc *dev, daddr_t dblk, int b
  * disk.  And, incidentally, what is returned is not the geometry as
  * such but the highest valid cylinder, head, and sector numbers.
  */
-u_int32_t
+uint32_t
 bd_getbigeom(int bunit)
 {
 

Modified: head/stand/i386/libi386/biospnp.c
==============================================================================
--- head/stand/i386/libi386/biospnp.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/biospnp.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -49,49 +49,49 @@ struct pnphandler biospnphandler =
 
 struct pnp_ICstructure
 {
-    u_int8_t	pnp_signature[4];
-    u_int8_t	pnp_version;
-    u_int8_t	pnp_length;
-    u_int16_t	pnp_BIOScontrol;
-    u_int8_t	pnp_checksum;
-    u_int32_t	pnp_eventflag;
-    u_int16_t	pnp_rmip;
-    u_int16_t	pnp_rmcs;
-    u_int16_t	pnp_pmip;
-    u_int32_t	pnp_pmcs;
-    u_int8_t	pnp_OEMdev[4];
-    u_int16_t	pnp_rmds;
-    u_int32_t	pnp_pmds;
+    uint8_t	pnp_signature[4];
+    uint8_t	pnp_version;
+    uint8_t	pnp_length;
+    uint16_t	pnp_BIOScontrol;
+    uint8_t	pnp_checksum;
+    uint32_t	pnp_eventflag;
+    uint16_t	pnp_rmip;
+    uint16_t	pnp_rmcs;
+    uint16_t	pnp_pmip;
+    uint32_t	pnp_pmcs;
+    uint8_t	pnp_OEMdev[4];
+    uint16_t	pnp_rmds;
+    uint32_t	pnp_pmds;
 } __packed;
 
 struct pnp_devNode 
 {
-    u_int16_t	dn_size;
-    u_int8_t	dn_handle;
-    u_int8_t	dn_id[4];
-    u_int8_t	dn_type[3];
-    u_int16_t	dn_attrib;
-    u_int8_t	dn_data[1];
+    uint16_t	dn_size;
+    uint8_t	dn_handle;
+    uint8_t	dn_id[4];
+    uint8_t	dn_type[3];
+    uint16_t	dn_attrib;
+    uint8_t	dn_data[1];
 } __packed;
 
 struct pnp_isaConfiguration
 {
-    u_int8_t	ic_revision;
-    u_int8_t	ic_nCSN;
-    u_int16_t	ic_rdport;
-    u_int16_t	ic_reserved;
+    uint8_t	ic_revision;
+    uint8_t	ic_nCSN;
+    uint16_t	ic_rdport;
+    uint16_t	ic_reserved;
 } __packed;
 
 static struct pnp_ICstructure	*pnp_Icheck = NULL;
-static u_int16_t		pnp_NumNodes;
-static u_int16_t		pnp_NodeSize;
+static uint16_t			pnp_NumNodes;
+static uint16_t			pnp_NodeSize;
 
 static void	biospnp_scanresdata(struct pnpinfo *pi, struct pnp_devNode *dn);
 static int	biospnp_call(int func, const char *fmt, ...);
 
-#define vsegofs(vptr)	(((u_int32_t)VTOPSEG(vptr) << 16) + VTOPOFF(vptr))
+#define vsegofs(vptr)	(((uint32_t)VTOPSEG(vptr) << 16) + VTOPOFF(vptr))
 
-typedef void    v86bios_t(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+typedef void    v86bios_t(uint32_t, uint32_t, uint32_t, uint32_t);
 v86bios_t	*v86bios = (v86bios_t *)v86int;
 
 #define	biospnp_f00(NumNodes, NodeSize)			biospnp_call(0x00, "ll", NumNodes, NodeSize)
@@ -155,7 +155,7 @@ biospnp_init(void)
 static void
 biospnp_enumerate(void)
 {
-    u_int8_t		Node;
+    uint8_t		Node;
     struct pnp_devNode	*devNodeBuffer;
     int			result;
     struct pnpinfo	*pi;
@@ -189,11 +189,11 @@ static void
 biospnp_scanresdata(struct pnpinfo *pi, struct pnp_devNode *dn)
 {
     u_int	tag, i, rlen, dlen;
-    u_int8_t	*p;
+    uint8_t	*p;
     char	*str;
 
     p = dn->dn_data;			/* point to resource data */
-    dlen = dn->dn_size - (p - (u_int8_t *)dn);	/* length of resource data */
+    dlen = dn->dn_size - (p - (uint8_t *)dn);	/* length of resource data */
 
     for (i = 0; i < dlen; i+= rlen) {
 	tag = p[i];
@@ -213,8 +213,8 @@ biospnp_scanresdata(struct pnpinfo *pi, struct pnp_dev
 	    }
 	} else {
 	    /* large resource */
-	    rlen = *(u_int16_t *)(p + i);
-	    i += sizeof(u_int16_t);
+	    rlen = *(uint16_t *)(p + i);
+	    i += sizeof(uint16_t);
 	    
 	    switch(PNP_LRES_NUM(tag)) {
 
@@ -249,14 +249,14 @@ biospnp_call(int func, const char *fmt, ...)
 {
     va_list	ap;
     const char	*p;
-    u_int8_t	*argp;
-    u_int32_t	args[4];
-    u_int32_t	i;
+    uint8_t	*argp;
+    uint32_t	args[4];
+    uint32_t	i;
 
     /* function number first */
-    argp = (u_int8_t *)args;
-    *(u_int16_t *)argp = func;
-    argp += sizeof(u_int16_t);
+    argp = (uint8_t *)args;
+    *(uint16_t *)argp = func;
+    argp += sizeof(uint16_t);
 
     /* take args according to format */
     va_start(ap, fmt);
@@ -265,26 +265,26 @@ biospnp_call(int func, const char *fmt, ...)
 
 	case 'w':
 	    i = va_arg(ap, u_int);
-	    *(u_int16_t *)argp = i;
-	    argp += sizeof(u_int16_t);
+	    *(uint16_t *)argp = i;
+	    argp += sizeof(uint16_t);
 	    break;
 	    
 	case 'l':
-	    i = va_arg(ap, u_int32_t);
-	    *(u_int32_t *)argp = i;
-	    argp += sizeof(u_int32_t);
+	    i = va_arg(ap, uint32_t);
+	    *(uint32_t *)argp = i;
+	    argp += sizeof(uint32_t);
 	    break;
 	}
     }
     va_end(ap);
 
     /* BIOS segment last */
-    *(u_int16_t *)argp = pnp_Icheck->pnp_rmds;
-    argp += sizeof(u_int16_t);
+    *(uint16_t *)argp = pnp_Icheck->pnp_rmds;
+    argp += sizeof(uint16_t);
 
     /* prepare for call */
     v86.ctl = V86_ADDR | V86_CALLF; 
-    v86.addr = ((u_int32_t)pnp_Icheck->pnp_rmcs << 16) + pnp_Icheck->pnp_rmip;
+    v86.addr = ((uint32_t)pnp_Icheck->pnp_rmcs << 16) + pnp_Icheck->pnp_rmip;
     
     /* call with packed stack and return */
     v86bios(args[0], args[1], args[2], args[3]);

Modified: head/stand/i386/libi386/bootinfo32.c
==============================================================================
--- head/stand/i386/libi386/bootinfo32.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/bootinfo32.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -63,7 +63,7 @@ static struct bootinfo  bi;
  * MOD_METADATA	(variable)		type-specific metadata
  */
 #define COPY32(v, a, c) {			\
-    u_int32_t	x = (v);			\
+    uint32_t	x = (v);			\
     if (c)					\
 	i386_copyin(&x, a, sizeof(x));		\
     a += sizeof(x);				\

Modified: head/stand/i386/libi386/bootinfo64.c
==============================================================================
--- head/stand/i386/libi386/bootinfo64.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/bootinfo64.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -64,7 +64,7 @@ static const size_t keybuf_size = sizeof(struct keybuf
  * MOD_METADATA	(variable)		type-specific metadata
  */
 #define COPY32(v, a, c) {			\
-    u_int32_t	x = (v);			\
+    uint32_t	x = (v);			\
     if (c)					\
 	i386_copyin(&x, a, sizeof(x));		\
     a += sizeof(x);				\
@@ -75,7 +75,7 @@ static const size_t keybuf_size = sizeof(struct keybuf
     COPY32(strlen(s) + 1, a, c);		\
     if (c)					\
 	i386_copyin(s, a, strlen(s) + 1);	\
-    a += roundup(strlen(s) + 1, sizeof(u_int64_t));\
+    a += roundup(strlen(s) + 1, sizeof(uint64_t));\
 }
 
 #define MOD_NAME(a, s, c)	MOD_STR(MODINFO_NAME, a, s, c)
@@ -87,7 +87,7 @@ static const size_t keybuf_size = sizeof(struct keybuf
     COPY32(sizeof(s), a, c);			\
     if (c)					\
 	i386_copyin(&s, a, sizeof(s));		\
-    a += roundup(sizeof(s), sizeof(u_int64_t));	\
+    a += roundup(sizeof(s), sizeof(uint64_t));	\
 }
 
 #define MOD_ADDR(a, s, c)	MOD_VAR(MODINFO_ADDR, a, s, c)
@@ -98,7 +98,7 @@ static const size_t keybuf_size = sizeof(struct keybuf
     COPY32(mm->md_size, a, c);			\
     if (c)					\
 	i386_copyin(mm->md_data, a, mm->md_size); \
-    a += roundup(mm->md_size, sizeof(u_int64_t));\
+    a += roundup(mm->md_size, sizeof(uint64_t));\
 }
 
 #define MOD_END(a, c) {				\
@@ -112,7 +112,7 @@ bi_copymodules64(vm_offset_t addr)
     struct preloaded_file	*fp;
     struct file_metadata	*md;
     int				c;
-    u_int64_t			v;
+    uint64_t			v;
 
     c = addr != 0;
     /* start with the first module on the list, should be the kernel */
@@ -190,9 +190,9 @@ bi_load64(char *args, vm_offset_t addr, vm_offset_t *m
     struct preloaded_file	*xp, *kfp;
     struct i386_devdesc		*rootdev;
     struct file_metadata	*md;
-    u_int64_t			kernend;
-    u_int64_t			envp;
-    u_int64_t			module;
+    uint64_t			kernend;
+    uint64_t			envp;
+    uint64_t			module;
     vm_offset_t			size;
     char			*rootdevname;
     int				howto;

Modified: head/stand/i386/libi386/elf64_freebsd.c
==============================================================================
--- head/stand/i386/libi386/elf64_freebsd.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/elf64_freebsd.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -51,15 +51,15 @@ struct file_format amd64_elf_obj = { elf64_obj_loadfil
 #define PG_U	0x004
 #define PG_PS	0x080
 
-typedef u_int64_t p4_entry_t;
-typedef u_int64_t p3_entry_t;
-typedef u_int64_t p2_entry_t;
+typedef uint64_t p4_entry_t;
+typedef uint64_t p3_entry_t;
+typedef uint64_t p2_entry_t;
 extern p4_entry_t PT4[];
 extern p3_entry_t PT3[];
 extern p2_entry_t PT2[];
 
-u_int32_t entry_hi;
-u_int32_t entry_lo;
+uint32_t entry_hi;
+uint32_t entry_lo;
 
 extern void amd64_tramp();
 

Modified: head/stand/i386/libi386/multiboot.c
==============================================================================
--- head/stand/i386/libi386/multiboot.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/multiboot.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -61,16 +61,16 @@ __FBSDID("$FreeBSD$");
 #define METADATA_RESV_SIZE(mod_num) \
 	roundup(METADATA_FIXED_SIZE + METADATA_MODULE_SIZE * mod_num, PAGE_SIZE)
 
-extern int elf32_loadfile_raw(char *filename, u_int64_t dest,
+extern int elf32_loadfile_raw(char *filename, uint64_t dest,
     struct preloaded_file **result, int multiboot);
-extern int elf64_load_modmetadata(struct preloaded_file *fp, u_int64_t dest);
-extern int elf64_obj_loadfile(char *filename, u_int64_t dest,
+extern int elf64_load_modmetadata(struct preloaded_file *fp, uint64_t dest);
+extern int elf64_obj_loadfile(char *filename, uint64_t dest,
     struct preloaded_file **result);
 
-static int multiboot_loadfile(char *, u_int64_t, struct preloaded_file **);
+static int multiboot_loadfile(char *, uint64_t, struct preloaded_file **);
 static int multiboot_exec(struct preloaded_file *);
 
-static int multiboot_obj_loadfile(char *, u_int64_t, struct preloaded_file **);
+static int multiboot_obj_loadfile(char *, uint64_t, struct preloaded_file **);
 static int multiboot_obj_exec(struct preloaded_file *fp);
 
 struct file_format multiboot = { multiboot_loadfile, multiboot_exec };
@@ -108,7 +108,7 @@ max_addr(void)
 }
 
 static int
-multiboot_loadfile(char *filename, u_int64_t dest,
+multiboot_loadfile(char *filename, uint64_t dest,
     struct preloaded_file **result)
 {
 	uint32_t		*magic;
@@ -394,7 +394,7 @@ error:
 }
 
 static int
-multiboot_obj_loadfile(char *filename, u_int64_t dest,
+multiboot_obj_loadfile(char *filename, uint64_t dest,
     struct preloaded_file **result)
 {
 	struct preloaded_file	*mfp, *kfp, *rfp;

Modified: head/stand/i386/libi386/pxe.c
==============================================================================
--- head/stand/i386/libi386/pxe.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/libi386/pxe.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -85,11 +85,11 @@ static ssize_t	pxe_netif_put(struct iodesc *desc, void
 static void	pxe_netif_end(struct netif *nif);
 
 extern struct netif_stats	pxe_st[];
-extern u_int16_t		__bangpxeseg;
-extern u_int16_t		__bangpxeoff;
+extern uint16_t			__bangpxeseg;
+extern uint16_t			__bangpxeoff;
 extern void			__bangpxeentry(void);
-extern u_int16_t		__pxenvseg;
-extern u_int16_t		__pxenvoff;
+extern uint16_t			__pxenvseg;
+extern uint16_t			__pxenvoff;
 extern void			__pxenventry(void);
 
 struct netif_dif pxe_ifs[] = {

Modified: head/stand/i386/loader/main.c
==============================================================================
--- head/stand/i386/loader/main.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/i386/loader/main.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -60,8 +60,8 @@ CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE
 /* Arguments passed in from the boot1/boot2 loader */
 static struct bootargs *kargs;
 
-static u_int32_t	initial_howto;
-static u_int32_t	initial_bootdev;
+static uint32_t		initial_howto;
+static uint32_t		initial_bootdev;
 static struct bootinfo	*initial_bootinfo;
 
 struct arch_switch	archsw;		/* MI/MD interface boundary */

Modified: head/stand/libsa/arp.c
==============================================================================
--- head/stand/libsa/arp.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/libsa/arp.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -164,7 +164,7 @@ arprecv(struct iodesc *d, void **pkt, void **payload, 
 {
 	ssize_t n;
 	struct ether_arp *ah;
-	u_int16_t etype;	/* host order */
+	uint16_t etype;	/* host order */
 	void *ptr;
 
 #ifdef ARP_DEBUG

Modified: head/stand/libsa/bootp.c
==============================================================================
--- head/stand/libsa/bootp.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/libsa/bootp.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -190,7 +190,7 @@ bootp(int sock)
 
 #ifdef SUPPORT_DHCP
 	if(dhcp_ok) {
-		u_int32_t leasetime;
+		uint32_t leasetime;
 		bp->bp_vend[6] = DHCPREQUEST;
 		bp->bp_vend[7] = TAG_REQ_ADDR;
 		bp->bp_vend[8] = 4;

Modified: head/stand/libsa/bootparam.c
==============================================================================
--- head/stand/libsa/bootparam.c	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/libsa/bootparam.c	Tue Mar 13 16:33:00 2018	(r330864)
@@ -77,7 +77,7 @@ n_short		bp_server_port;	/* net order */
  * (Note, really four ints, NOT chars.  Blech.)
  */
 struct xdr_inaddr {
-	u_int32_t  atype;
+	uint32_t  atype;
 	int32_t	addr[4];
 };
 
@@ -108,16 +108,16 @@ bp_whoami(int sockfd)
 {
 	/* RPC structures for PMAPPROC_CALLIT */
 	struct args {
-		u_int32_t prog;
-		u_int32_t vers;
-		u_int32_t proc;
-		u_int32_t arglen;
+		uint32_t prog;
+		uint32_t vers;
+		uint32_t proc;
+		uint32_t arglen;
 		struct xdr_inaddr xina;
 	} *args;
 	struct repl {
-		u_int16_t _pad;
-		u_int16_t port;
-		u_int32_t encap_len;
+		uint16_t _pad;
+		uint16_t port;
+		uint32_t encap_len;
 		/* encapsulated data here */
 		n_long  capsule[64];
 	} *repl;

Modified: head/stand/libsa/dosfs.h
==============================================================================
--- head/stand/libsa/dosfs.h	Tue Mar 13 16:31:54 2018	(r330863)
+++ head/stand/libsa/dosfs.h	Tue Mar 13 16:33:00 2018	(r330864)
@@ -47,12 +47,12 @@
  * Macros to convert DOS-format 16-bit and 32-bit quantities
  */
 
-#define cv2(p)  ((u_int16_t)(p)[0] |         \
-                ((u_int16_t)(p)[1] << 010))
-#define cv4(p)  ((u_int32_t)(p)[0] |          \
-                ((u_int32_t)(p)[1] << 010) |  \
-                ((u_int32_t)(p)[2] << 020) |  \
-                ((u_int32_t)(p)[3] << 030))

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-head mailing list