Module Name: src
Committed By: martin
Date: Sat Jul 20 15:47:51 UTC 2024
Modified Files:
src/distrib/sets/lists/comp [netbsd-10]: mi
src/share/man/man9 [netbsd-10]: Makefile imax.9
Log Message:
Pull up following revision(s) (requested by rin in ticket #762):
share/man/man9/imax.9: revision 1.7
share/man/man9/imax.9: revision 1.8
share/man/man9/Makefile: revision 1.471
distrib/sets/lists/comp/mi: revision 1.2463
imax(9): Belatedly catch up with min/max --> uimin/uimax renaming
done almost 6 years ago:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/lib/libkern/libkern.h#rev1.130
Thanks asahi at iij for pointing this out :)
imax.9: Additional fixes for previous...
man9: Provide all combinations of {,u}{i,l}{max,min}(9)
sets/lists: Add all combinations of {,u}{i,l}{max,min}(9)
To generate a diff of this commit:
cvs rdiff -u -r1.2425.2.4 -r1.2425.2.5 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.465.2.1 -r1.465.2.2 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.6.56.1 src/share/man/man9/imax.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2425.2.4 src/distrib/sets/lists/comp/mi:1.2425.2.5
--- src/distrib/sets/lists/comp/mi:1.2425.2.4 Sun Feb 25 15:47:58 2024
+++ src/distrib/sets/lists/comp/mi Sat Jul 20 15:47:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2425.2.4 2024/02/25 15:47:58 martin Exp $
+# $NetBSD: mi,v 1.2425.2.5 2024/07/20 15:47:50 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -12126,6 +12126,8 @@
./usr/share/man/cat9/le64enc.0 comp-sys-catman .cat
./usr/share/man/cat9/le64toh.0 comp-sys-catman .cat
./usr/share/man/cat9/linedisc.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmin.0 comp-sys-catman .cat
./usr/share/man/cat9/localcount.0 comp-sys-catman .cat
./usr/share/man/cat9/lock.0 comp-sys-catman .cat
./usr/share/man/cat9/locking.0 comp-sys-catman .cat
@@ -12819,7 +12821,11 @@
./usr/share/man/cat9/ufetch_long.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_ptr.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_short.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimax.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimin.0 comp-sys-catman .cat
./usr/share/man/cat9/uiomove.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmin.0 comp-sys-catman .cat
./usr/share/man/cat9/ungetnewvnode.0 comp-obsolete obsolete
./usr/share/man/cat9/untimeout.0 comp-sys-catman .cat
./usr/share/man/cat9/uprintf.0 comp-sys-catman .cat
@@ -20471,6 +20477,8 @@
./usr/share/man/html9/le64enc.html comp-sys-htmlman html
./usr/share/man/html9/le64toh.html comp-sys-htmlman html
./usr/share/man/html9/linedisc.html comp-sys-htmlman html
+./usr/share/man/html9/lmax.html comp-sys-htmlman html
+./usr/share/man/html9/lmin.html comp-sys-htmlman html
./usr/share/man/html9/localcount.html comp-sys-htmlman html
./usr/share/man/html9/lock.html comp-sys-htmlman html
./usr/share/man/html9/locking.html comp-sys-htmlman html
@@ -21137,7 +21145,11 @@
./usr/share/man/html9/ufetch_long.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_ptr.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_short.html comp-sys-htmlman html
+./usr/share/man/html9/uimax.html comp-sys-htmlman html
+./usr/share/man/html9/uimin.html comp-sys-htmlman html
./usr/share/man/html9/uiomove.html comp-sys-htmlman html
+./usr/share/man/html9/ulmax.html comp-sys-htmlman html
+./usr/share/man/html9/ulmin.html comp-sys-htmlman html
./usr/share/man/html9/ungetnewvnode.html comp-obsolete obsolete
./usr/share/man/html9/untimeout.html comp-sys-htmlman html
./usr/share/man/html9/uprintf.html comp-sys-htmlman html
@@ -28969,6 +28981,8 @@
./usr/share/man/man9/le64enc.9 comp-sys-man .man
./usr/share/man/man9/le64toh.9 comp-sys-man .man
./usr/share/man/man9/linedisc.9 comp-sys-man .man
+./usr/share/man/man9/lmax.9 comp-sys-man .man
+./usr/share/man/man9/lmin.9 comp-sys-man .man
./usr/share/man/man9/localcount.9 comp-sys-man .man
./usr/share/man/man9/lock.9 comp-sys-man .man
./usr/share/man/man9/locking.9 comp-sys-man .man
@@ -29662,7 +29676,11 @@
./usr/share/man/man9/ufetch_long.9 comp-sys-man .man
./usr/share/man/man9/ufetch_ptr.9 comp-sys-man .man
./usr/share/man/man9/ufetch_short.9 comp-sys-man .man
+./usr/share/man/man9/uimax.9 comp-sys-man .man
+./usr/share/man/man9/uimin.9 comp-sys-man .man
./usr/share/man/man9/uiomove.9 comp-sys-man .man
+./usr/share/man/man9/ulmax.9 comp-sys-man .man
+./usr/share/man/man9/ulmin.9 comp-sys-man .man
./usr/share/man/man9/ungetnewvnode.9 comp-obsolete obsolete
./usr/share/man/man9/untimeout.9 comp-sys-man .man
./usr/share/man/man9/uprintf.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.465.2.1 src/share/man/man9/Makefile:1.465.2.2
--- src/share/man/man9/Makefile:1.465.2.1 Sun Jan 14 15:17:12 2024
+++ src/share/man/man9/Makefile Sat Jul 20 15:47:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.465.2.1 2024/01/14 15:17:12 martin Exp $
+# $NetBSD: Makefile,v 1.465.2.2 2024/07/20 15:47:50 martin Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -412,7 +412,13 @@ MLINKS+=iic.9 iic_acquire_bus.9 \
iic.9 iic_smbus_write_byte.9 \
iic.9 iic_smbus_read_byte.9 \
iic.9 iic_smbus_receive_byte.9
-MLINKS+=imax.9 imin.9
+MLINKS+=imax.9 imin.9 \
+ imax.9 lmax.9 \
+ imax.9 lmin.9 \
+ imax.9 uimax.9 \
+ imax.9 uimin.9 \
+ imax.9 ulmax.9 \
+ imax.9 ulmin.9
MLINKS+=in4_cksum.9 in_cksum.9 \
in4_cksum.9 in6_cksum.9
MLINKS+=ioasic.9 ioasic_intr_establish.9 \
Index: src/share/man/man9/imax.9
diff -u src/share/man/man9/imax.9:1.6 src/share/man/man9/imax.9:1.6.56.1
--- src/share/man/man9/imax.9:1.6 Tue Jun 8 08:55:46 2010
+++ src/share/man/man9/imax.9 Sat Jul 20 15:47:50 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: imax.9,v 1.6 2010/06/08 08:55:46 jruoho Exp $
+.\" $NetBSD: imax.9,v 1.6.56.1 2024/07/20 15:47:50 martin Exp $
.\"
.\" Copyright (c) 2006 Igor Sobrado
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 8, 2010
+.Dd July 10, 2024
.Dt IMAX 9
.Os
.Sh NAME
@@ -32,8 +32,8 @@
.Nm imin ,
.Nm lmax ,
.Nm lmin ,
-.Nm max ,
-.Nm min ,
+.Nm uimax ,
+.Nm uimin ,
.Nm ulmax ,
.Nm ulmin
.Nd compare integers
@@ -47,9 +47,9 @@
.Ft long
.Fn lmin "long a" "long b"
.Ft u_int
-.Fn max "u_int a" "u_int b"
+.Fn uimax "u_int a" "u_int b"
.Ft u_int
-.Fn min "u_int a" "u_int b"
+.Fn uimin "u_int a" "u_int b"
.Ft u_long
.Fn ulmax "u_long a" "u_long b"
.Ft u_long
@@ -58,7 +58,7 @@
The
.Fn imin ,
.Fn lmin ,
-.Fn min ,
+.Fn uimin ,
and
.Fn ulmin
functions return whichever argument is algebraically smaller, differing only
@@ -68,7 +68,7 @@ natural size, long, unsigned and unsigne
The
.Fn imax ,
.Fn lmax ,
-.Fn max ,
+.Fn uimax ,
and
.Fn ulmax
functions are identical except that they return the algebraically larger
