[Midnightbsd-cvs] src: libc/stdlib: Merge changes.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Oct 30 17:08:54 EDT 2008


Log Message:
-----------
Merge changes.

Modified Files:
--------------
    src/lib/libc/stdlib:
        strtol.3 (r1.2 -> r1.3)
        strtod.3 (r1.2 -> r1.3)

-------------- next part --------------
Index: strtod.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/strtod.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/strtod.3 -L lib/libc/stdlib/strtod.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/strtod.3
+++ lib/libc/stdlib/strtod.3
@@ -13,10 +13,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -34,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.20 2005/01/20 09:17:04 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.21 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd March 2, 2003
 .Dt STRTOD 3
@@ -146,7 +142,6 @@
 .Xr atol 3 ,
 .Xr strtol 3 ,
 .Xr strtoul 3 ,
-.Xr strtonum 3,
 .Xr wcstod 3
 .Sh STANDARDS
 The
Index: strtol.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/strtol.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/strtol.3 -L lib/libc/stdlib/strtol.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/strtol.3
+++ lib/libc/stdlib/strtol.3
@@ -13,10 +13,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -34,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/strtol.3,v 1.20 2005/01/22 18:02:58 ache Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/strtol.3,v 1.23 2007/04/10 11:17:00 ru Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOL 3
@@ -181,8 +177,8 @@
 .Er ERANGE
 and the function return value is clamped according
 to the following table.
-.Bl -column -offset indent ".Fn strtoimax" ".Sy overflow" ".Sy underflow"
-.It Sy Function Ta Sy overflow Ta Sy underflow
+.Bl -column -offset indent ".Fn strtoimax" ".Sy underflow" ".Sy overflow"
+.It Sy Function Ta Sy underflow Ta Sy overflow
 .It Fn strtol Ta Dv LONG_MIN Ta Dv LONG_MAX
 .It Fn strtoll Ta Dv LLONG_MIN Ta Dv LLONG_MAX
 .It Fn strtoimax Ta Dv INTMAX_MIN Ta Dv INTMAX_MAX
@@ -204,7 +200,7 @@
 .Xr atoi 3 ,
 .Xr atol 3 ,
 .Xr strtod 3 ,
-.Xr strtonum 3,
+.Xr strtonum 3 ,
 .Xr strtoul 3 ,
 .Xr wcstol 3
 .Sh STANDARDS


More information about the Midnightbsd-cvs mailing list