[Midnightbsd-cvs] src: libc/stdlib: Merge changes.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 30 17:11:45 EDT 2008
Log Message:
-----------
Merge changes.
Modified Files:
--------------
src/lib/libc/stdlib:
a64l.3 (r1.2 -> r1.3)
a64l.c (r1.2 -> r1.3)
atof.3 (r1.2 -> r1.3)
atoi.3 (r1.2 -> r1.3)
atol.3 (r1.2 -> r1.3)
-------------- next part --------------
Index: atoi.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/atoi.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/atoi.3 -L lib/libc/stdlib/atoi.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/atoi.3
+++ lib/libc/stdlib/atoi.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.
.\"
.\" @(#)atoi.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.12 2002/12/18 13:33:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.13 2007/01/09 00:28:09 imp Exp $
.\"
.Dd June 4, 1993
.Dt ATOI 3
@@ -84,8 +80,7 @@
.Xr atol 3 ,
.Xr strtod 3 ,
.Xr strtol 3 ,
-.Xr strtoul 3,
-.Xr strtonum 3
+.Xr strtoul 3
.Sh STANDARDS
The
.Fn atoi
Index: atol.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/atol.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/atol.3 -L lib/libc/stdlib/atol.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/atol.3
+++ lib/libc/stdlib/atol.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.
.\"
.\" @(#)atol.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.13 2002/01/09 14:03:54 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.14 2007/01/09 00:28:09 imp Exp $
.\"
.Dd November 28, 2001
.Dt ATOL 3
@@ -96,8 +92,7 @@
.Xr atoi 3 ,
.Xr strtod 3 ,
.Xr strtol 3 ,
-.Xr strtoul 3,
-.Xr strtonum 3
+.Xr strtoul 3
.Sh STANDARDS
The
.Fn atol
Index: a64l.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/a64l.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/a64l.3 -L lib/libc/stdlib/a64l.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/a64l.3
+++ lib/libc/stdlib/a64l.3
@@ -32,7 +32,7 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.1.2.1 2006/01/27 05:17:25 trhodes Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.3 2006/09/30 10:29:43 ru Exp $
.\"
.Dd November 20, 2005
.Dt A64L 3
@@ -67,32 +67,26 @@
are
.Ql .\&
for 0,
-.Ql /\&
+.Ql /
for 1,
-.Ql 0\&
-.Fl
-.Ql 9\&
-for 2
-.Fl
-11,
-.Ql A\&
-.Fl
-.Ql Z\&
-for 12
-.Fl
-37, and
-.Ql a\&
-.Fl
-.Ql z\&
-for 38
-.Fl
-63.
+.Ql 0
+-
+.Ql 9
+for 2 - 11,
+.Ql A
+-
+.Ql Z
+for 12 - 37, and
+.Ql a
+-
+.Ql z
+for 38 - 63.
.Pp
The
.Fn a64l
function takes a pointer to a radix-64 representation, in which the first
digit is the least significant, and returns a corresponding
-.Ft long
+.Vt long
value.
If the string pointed to by
.Fa s
@@ -120,7 +114,9 @@
.Pp
The
.Fn l64a
-function takes a long argument and returns a pointer to the corresponding
+function takes a
+.Vt long
+argument and returns a pointer to the corresponding
radix-64 representation.
The behavior of
.Fn l64a
@@ -141,19 +137,23 @@
.Fa buffer ,
consuming at most
.Fa buflen
-characters including the terminating NUL character.
+characters including the terminating
+.Dv NUL
+character.
.Sh RETURN VALUES
On successful completion,
.Fn a64l
returns the
-.Ft long
+.Vt long
value resulting from conversion of the input string.
-If a string pointed to by s is an empty string,
+If a string pointed to by
+.Fa s
+is an empty string,
.Fn a64l
returns 0.
.Pp
The
-l64a
+.Fn l64a
function returns a pointer to the radix-64 representation.
If value is 0,
.Fn l64a
@@ -169,7 +169,7 @@
functions are derived from
.Nx
with modifications.
-They were added to
+They appeared in
.Fx 6.1 .
.Sh AUTHORS
The
@@ -177,6 +177,7 @@
.Fn l64a ,
and
.Fn l64a_r
+functions
were added to
.Fx
by
Index: a64l.c
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/a64l.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/a64l.c -L lib/libc/stdlib/a64l.c -u -r1.2 -r1.3
--- lib/libc/stdlib/a64l.c
+++ lib/libc/stdlib/a64l.c
@@ -10,7 +10,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/a64l.c,v 1.1.2.1 2006/01/27 05:17:25 trhodes Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/a64l.c,v 1.2 2006/05/19 19:06:38 jkim Exp $");
#include <stdlib.h>
#include <inttypes.h>
Index: atof.3
===================================================================
RCS file: /home/cvs/src/lib/libc/stdlib/atof.3,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/stdlib/atof.3 -L lib/libc/stdlib/atof.3 -u -r1.2 -r1.3
--- lib/libc/stdlib/atof.3
+++ lib/libc/stdlib/atof.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.
.\"
.\" @(#)atof.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atof.3,v 1.16 2002/12/18 13:33:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atof.3,v 1.17 2007/01/09 00:28:09 imp Exp $
.\"
.Dd June 4, 1993
.Dt ATOF 3
@@ -88,8 +84,7 @@
.Xr atol 3 ,
.Xr strtod 3 ,
.Xr strtol 3 ,
-.Xr strtoul 3,
-.Xr strtonum 3
+.Xr strtoul 3
.Sh STANDARDS
The
.Fn atof
More information about the Midnightbsd-cvs
mailing list