Module Name: src Committed By: martin Date: Thu Apr 18 16:02:26 UTC 2024
Modified Files: src/external/bsd/am-utils/dist/amd [netbsd-8]: amq_subr.c src/external/bsd/am-utils/dist/amq [netbsd-8]: amq.c amq_xdr.c src/external/bsd/am-utils/dist/include [netbsd-8]: amq_defs.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #1956): external/bsd/am-utils/dist/include/amq_defs.h: revision 1.2 external/bsd/am-utils/dist/amq/amq_xdr.c: revision 1.2 external/bsd/am-utils/dist/amq/amq.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.5 fix pointer bug (thanks RVP) and change to use 64 bit times. Don't bother with backwards compatibility; too much work for little benefit. remove long cast (thanks RVP) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amd/amq_subr.c cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amq/amq.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \ src/external/bsd/am-utils/dist/amq/amq_xdr.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \ src/external/bsd/am-utils/dist/include/amq_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/am-utils/dist/amd/amq_subr.c diff -u src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3.8.1 --- src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 Sun Jan 18 16:27:36 2015 +++ src/external/bsd/am-utils/dist/amd/amq_subr.c Thu Apr 18 16:02:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: amq_subr.c,v 1.3 2015/01/18 16:27:36 christos Exp $ */ +/* $NetBSD: amq_subr.c,v 1.3.8.1 2024/04/18 16:02:26 martin Exp $ */ /* * Copyright (c) 1997-2014 Erez Zadok @@ -331,7 +331,7 @@ bool_t xdr_amq_mount_tree_node(XDR *xdrs, amq_mount_tree *objp) { am_node *mp = (am_node *) objp; - long mtime; + longlong_t mtime; if (!xdr_amq_string(xdrs, &mp->am_al->al_mnt->mf_info)) { return (FALSE); @@ -346,7 +346,7 @@ xdr_amq_mount_tree_node(XDR *xdrs, amq_m return (FALSE); } mtime = mp->am_stats.s_mtime; - if (!xdr_long(xdrs, &mtime)) { + if (!xdr_longlong_t(xdrs, &mtime)) { return (FALSE); } if (!xdr_u_short(xdrs, &mp->am_stats.s_uid)) { @@ -530,7 +530,7 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem u_int len = 0; int x; char *n; - long modify; + longlong_t modify; /* * Compute length of list @@ -555,8 +555,8 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem return (FALSE); } - modify = (long)m->modify; - if (!xdr_long(xdrs, &modify)) { + modify = m->modify; + if (!xdr_longlong_t(xdrs, &modify)) { return (FALSE); } Index: src/external/bsd/am-utils/dist/amq/amq.c diff -u src/external/bsd/am-utils/dist/amq/amq.c:1.3 src/external/bsd/am-utils/dist/amq/amq.c:1.3.8.1 --- src/external/bsd/am-utils/dist/amq/amq.c:1.3 Sun Jan 18 15:37:57 2015 +++ src/external/bsd/am-utils/dist/amq/amq.c Thu Apr 18 16:02:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: amq.c,v 1.3 2015/01/18 15:37:57 christos Exp $ */ +/* $NetBSD: amq.c,v 1.3.8.1 2024/04/18 16:02:26 martin Exp $ */ /* * Copyright (c) 1997-2014 Erez Zadok @@ -81,7 +81,7 @@ enum show_opt { static void time_print(time_type tt) { - time_t t = (time_t)*tt; + time_t t = (time_t)tt; struct tm *tp = localtime(&t); printf("%02d/%02d/%04d %02d:%02d:%02d", tp->tm_mon + 1, tp->tm_mday, Index: src/external/bsd/am-utils/dist/amq/amq_xdr.c diff -u src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3.8.1 --- src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 Sat Jan 17 16:34:15 2015 +++ src/external/bsd/am-utils/dist/amq/amq_xdr.c Thu Apr 18 16:02:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: amq_xdr.c,v 1.1.1.3 2015/01/17 16:34:15 christos Exp $ */ +/* $NetBSD: amq_xdr.c,v 1.1.1.3.8.1 2024/04/18 16:02:26 martin Exp $ */ /* * Copyright (c) 1997-2014 Erez Zadok @@ -49,7 +49,7 @@ bool_t xdr_time_type(XDR *xdrs, time_type *objp) { - if (!xdr_long(xdrs, (long *) objp)) { + if (!xdr_longlong_t(xdrs, (longlong_t *) objp)) { return (FALSE); } return (TRUE); Index: src/external/bsd/am-utils/dist/include/amq_defs.h diff -u src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3.8.1 --- src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 Sat Jan 17 16:34:18 2015 +++ src/external/bsd/am-utils/dist/include/amq_defs.h Thu Apr 18 16:02:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: amq_defs.h,v 1.1.1.3 2015/01/17 16:34:18 christos Exp $ */ +/* $NetBSD: amq_defs.h,v 1.1.1.3.8.1 2024/04/18 16:02:26 martin Exp $ */ /* * Copyright (c) 1997-2014 Erez Zadok @@ -68,7 +68,7 @@ /* * TYPEDEFS */ -typedef long *time_type; +typedef long long time_type; typedef struct amq_mount_info amq_mount_info; typedef struct amq_map_info amq_map_info; typedef struct amq_mount_stats amq_mount_stats;