summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2004-02-10 20:04:00 +0000
committerjmc <>2004-02-10 20:04:00 +0000
commit66dafc62fb33a0f4efcf641da6f346bd76a1fd3f (patch)
treebca698bd471fe72805250672ebc3d05d9a8f81b5
parent72440e9f6fbeb6d0580194b7b8d199236a6e8566 (diff)
downloadopenbsd-66dafc62fb33a0f4efcf641da6f346bd76a1fd3f.tar.gz
openbsd-66dafc62fb33a0f4efcf641da6f346bd76a1fd3f.tar.bz2
openbsd-66dafc62fb33a0f4efcf641da6f346bd76a1fd3f.zip
kill memory.3;
suggested by deraadt@
-rw-r--r--src/lib/libc/stdlib/Makefile.inc2
-rw-r--r--src/lib/libc/stdlib/memory.365
2 files changed, 1 insertions, 66 deletions
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
index ad46094309..74f8ff5e7a 100644
--- a/src/lib/libc/stdlib/Makefile.inc
+++ b/src/lib/libc/stdlib/Makefile.inc
@@ -40,7 +40,7 @@ SRCS+= insque.c remque.c
40 40
41MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \ 41MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \
42 bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \ 42 bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \
43 getsubopt.3 insque.3 labs.3 ldiv.3 lsearch.3 malloc.3 memory.3 qabs.3 \ 43 getsubopt.3 insque.3 labs.3 ldiv.3 lsearch.3 malloc.3 qabs.3 \
44 qdiv.3 qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \ 44 qdiv.3 qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \
45 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3 45 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3
46 46
diff --git a/src/lib/libc/stdlib/memory.3 b/src/lib/libc/stdlib/memory.3
deleted file mode 100644
index 84996f76c3..0000000000
--- a/src/lib/libc/stdlib/memory.3
+++ /dev/null
@@ -1,65 +0,0 @@
1.\" Copyright (c) 1991 Regents of the University of California.
2.\" All rights reserved.
3.\"
4.\" Redistribution and use in source and binary forms, with or without
5.\" modification, are permitted provided that the following conditions
6.\" are met:
7.\" 1. Redistributions of source code must retain the above copyright
8.\" notice, this list of conditions and the following disclaimer.
9.\" 2. Redistributions in binary form must reproduce the above copyright
10.\" notice, this list of conditions and the following disclaimer in the
11.\" documentation and/or other materials provided with the distribution.
12.\" 3. Neither the name of the University nor the names of its contributors
13.\" may be used to endorse or promote products derived from this software
14.\" without specific prior written permission.
15.\"
16.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
17.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
20.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26.\" SUCH DAMAGE.
27.\"
28.\" $OpenBSD: memory.3,v 1.6 2003/06/02 20:18:38 millert Exp $
29.\"
30.Dd May 2, 1991
31.Dt MEMORY 3
32.Os
33.Sh NAME
34.Nm malloc ,
35.Nm free ,
36.Nm realloc ,
37.Nm calloc ,
38.Nm alloca
39.Nd general memory allocation operations
40.Sh SYNOPSIS
41.Fd #include <stdlib.h>
42.Ft void *
43.Fn malloc "size_t size"
44.Ft void
45.Fn free "void *ptr"
46.Ft void *
47.Fn realloc "void *ptr" "size_t size"
48.Ft void *
49.Fn calloc "size_t nelem" "size_t elsize"
50.Ft void *
51.Fn alloca "size_t size"
52.Sh DESCRIPTION
53These functions allocate and free memory for the calling process.
54They are described in the individual man pages.
55.Sh SEE ALSO
56.Xr alloca 3 ,
57.Xr calloc 3 ,
58.Xr free 3 ,
59.Xr malloc 3 ,
60.Xr realloc 3
61.Sh STANDARDS
62These functions, with the exception of
63.Fn alloca ,
64conform to
65.St -ansiC .