git: 2262f7dcf476 - main - sys/xdr: Use C99 fixed-width integer types.

[John Baldwin]

The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2262f7dcf476b48bdf3dfc5d460cc5a5e14e23cd

commit 2262f7dcf476b48bdf3dfc5d460cc5a5e14e23cd
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2021-12-28 17:43:26 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2021-12-28 17:43:26 +0000

    sys/xdr: Use C99 fixed-width integer types.
    
    No functional change.
    
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D33642
---
 sys/xdr/xdr_mem.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/xdr/xdr_mem.c b/sys/xdr/xdr_mem.c
index 51449e70b675..bf365a8da210 100644
--- a/sys/xdr/xdr_mem.c
+++ b/sys/xdr/xdr_mem.c
@@ -121,7 +121,7 @@ xdrmem_getlong_aligned(XDR *xdrs, long *lp)
        if (xdrs->x_handy < sizeof(int32_t))
                return (FALSE);
        xdrs->x_handy -= sizeof(int32_t);
-       *lp = ntohl(*(u_int32_t *)xdrs->x_private);
+       *lp = ntohl(*(uint32_t *)xdrs->x_private);
        xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
        return (TRUE);
 }
@@ -133,7 +133,7 @@ xdrmem_putlong_aligned(XDR *xdrs, const long *lp)
        if (xdrs->x_handy < sizeof(int32_t))
                return (FALSE);
        xdrs->x_handy -= sizeof(int32_t);
-       *(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp);
+       *(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp);
        xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
        return (TRUE);
 }
@@ -141,7 +141,7 @@ xdrmem_putlong_aligned(XDR *xdrs, const long *lp)
 static bool_t
 xdrmem_getlong_unaligned(XDR *xdrs, long *lp)
 {
-       u_int32_t l;
+       uint32_t l;
 
        if (xdrs->x_handy < sizeof(int32_t))
                return (FALSE);
@@ -155,12 +155,12 @@ xdrmem_getlong_unaligned(XDR *xdrs, long *lp)
 static bool_t
 xdrmem_putlong_unaligned(XDR *xdrs, const long *lp)
 {
-       u_int32_t l;
+       uint32_t l;
 
        if (xdrs->x_handy < sizeof(int32_t))
                return (FALSE);
        xdrs->x_handy -= sizeof(int32_t);
-       l = htonl((u_int32_t)*lp);
+       l = htonl((uint32_t)*lp);
        memmove(xdrs->x_private, &l, sizeof(int32_t));
        xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
        return (TRUE);