[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
PERFORCE change 90504 for review
http://perforce.freebsd.org/chv.cgi?CH=90504
Change 90504 by alc@alc_home on 2006/01/27 21:17:27
IFC @90501 to loop back style fix
Affected files ...
.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 integrate
.. //depot/projects/superpages/doc/share/pgpkeys/delphij.key#2 integrate
.. //depot/projects/superpages/src/etc/pf.conf#2 integrate
.. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/superpages/src/lib/libdisk/Makefile#3 integrate
.. //depot/projects/superpages/src/lib/libdisk/libdisk.3#3 integrate
.. //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#2 integrate
.. //depot/projects/superpages/src/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/superpages/src/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/ce/ceddk.c#1 branch
.. //depot/projects/superpages/src/sys/dev/ce/ceddk.h#1 branch
.. //depot/projects/superpages/src/sys/dev/ce/if_ce.c#1 branch
.. //depot/projects/superpages/src/sys/dev/ce/ng_ce.h#1 branch
.. //depot/projects/superpages/src/sys/dev/ce/tau32-ddk.c#1 branch
.. //depot/projects/superpages/src/sys/dev/ce/tau32-ddk.h#1 branch
.. //depot/projects/superpages/src/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_3c503.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_hpp.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_isa.c#5 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_novell.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_sic.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/ed/if_edvar.h#4 integrate
.. //depot/projects/superpages/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/superpages/src/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/superpages/src/sys/modules/bktr/bktr/Makefile#3 integrate
.. //depot/projects/superpages/src/sys/netgraph/ng_pppoe.c#4 integrate
.. //depot/projects/superpages/src/sys/netgraph/ng_pppoe.h#3 integrate
.. //depot/projects/superpages/src/sys/vm/vm_pageq.c#9 integrate
.. //depot/projects/superpages/www/en/commercial/hardware.xml#4 integrate
.. //depot/projects/superpages/www/en/developers.sgml#4 integrate
.. //depot/projects/superpages/www/en/docproj/Makefile#2 integrate
.. //depot/projects/superpages/www/en/docproj/current.sgml#5 integrate
.. //depot/projects/superpages/www/en/docproj/todo.sgml#1 branch
.. //depot/projects/superpages/www/en/donations/donors.sgml#5 integrate
.. //depot/projects/superpages/www/en/donations/wantlist.sgml#8 integrate
.. //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#3 integrate
Differences ...
==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.509 2006/01/26 16:01:33 vd Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.510 2006/01/27 17:26:28 jylefort Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -7936,6 +7936,11 @@
</listitem>
<listitem>
+ <para>Shaun Amott
+ <email>shaun@xxxxxxxxx</email></para>
+ </listitem>
+
+ <listitem>
<para>Shaun Courtney
<email>shaun@xxxxxxxxxxxxxxxxxx</email></para>
</listitem>
==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.36 2005/12/01 17:35:03 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.37 2006/01/27 12:19:32 joel Exp $ -->
<sect2>
<title>The &os; Documentation Engineering Team</title>
@@ -120,10 +120,6 @@
</listitem>
<listitem>
- <para>&a.guido;</para>
- </listitem>
-
- <listitem>
<para>&a.des;</para>
</listitem>
==== //depot/projects/superpages/doc/share/pgpkeys/delphij.key#2 (text+ko) ====
@@ -1,14 +1,21 @@
-<!-- $FreeBSD: doc/share/pgpkeys/delphij.key,v 1.1 2004/09/16 13:50:54 delphij Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/delphij.key,v 1.2 2006/01/27 10:28:51 delphij Exp $ -->
<!--
-sh addkey.sh delphij CAEEB8C0;
+sh addkey.sh delphij 42EA8A4B CAEEB8C0;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 1024D/CAEEB8C0 2004-01-28 Xin LI <delphij@xxxxxxxxxxx>
- Key fingerprint = 43B8 B703 B8DD 0231 B333 DC28 39FB 93A0 CAEE B8C0
-uid Xin LI <delphij@xxxxxxxxxxxxx>
-sub 2048g/A44AC9F9 2004-01-28 [expires: 2005-01-01]
-sub 2048g/073737FC 2004-09-16 [expires: 2006-01-01]
-sub 1024D/1159888A 2004-09-16 [expires: 2006-01-01]
+pub 1024D/CAEEB8C0 2004-01-28
+ Key fingerprint = 43B8 B703 B8DD 0231 B333 DC28 39FB 93A0 CAEE B8C0
+uid Xin LI <delphij@xxxxxxxxxxx>
+uid Xin LI <delphij@xxxxxxxxxxxxx>
+uid Xin LI <delphij@xxxxxxxxxxx>
+uid Xin LI <delphij@xxxxxxxxxx>
+
+pub 1024D/42EA8A4B 2006-01-27 [expires: 2008-01-01]
+ Key fingerprint = F19C 2616 FA97 9C13 2581 C6F3 85C5 1CCE 42EA 8A4B
+uid Xin LI <delphij@xxxxxxxxxx>
+uid Xin LI <delphij@xxxxxxxxxxx>
+uid Xin LI <delphij@xxxxxxxxxxx>
+sub 4096g/11A94A02 2006-01-27 [expires: 2008-01-01]
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -21,48 +28,101 @@
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
-x7oTld1L156tRhL28onWY/YIU7X+LjjGXrM5Ptx8pwKgxMMN9LQeWGluIExJIDxk
-ZWxwaGlqQGZyb250ZnJlZS5uZXQ+iF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgEC
-HgECF4AFAkFJlYsACgkQOfuToMruuMBOFwCgg3l/tGrU7yEToftGF7IlQYDWcPEA
-nR6hGG5tUkyVBSmlgRR5qJTB11i2tBxYaW4gTEkgPGRlbHBoaWpARnJlZUJTRC5v
-cmc+iGEEExECACECGwMCHgECF4AGCwkIBwMCAxUCAwMWAgEFAkFJl+ECGQEACgkQ
-OfuToMruuMA/5QCdFjrkDnZ4/pkZMcNIV8TGyJbMwGkAn3GzIRyDy4qN3abgNH9+
-6Z72dhOUuQINBEAXU9oQCACE9YbWNaP344MmGzEwYACUtCAghdXNhPImALkmg4ii
-FzlwcFGTU6gx43QRhmOEb1n9mROBkpn/axEvSNrEqz6Vb9QpVvQwZfGvxyCiDfzm
-WXIHzXIy3frwx22O17UDVQ7rvU9oETmOhHwTAw0iKYsHRYgjBVtCgfzPxquocVb0
-Tt8fG8YKEBqxApT/FJaiISjz9xIhN3OhTYvnKB1lJYOtaAxYViwQYZsN7CSgYnPG
-mOcUVP0RyO6PTnRUnSWYbrY7LNaUfjDQ7n/zSbrEV/472R5+uGcyq0zF6g1FU2GJ
-kfTUcHMTH9Ww9qKuCOFOpNZNjbg2NXpdU58Pjg62tB7DAAMFB/0UMAHgQjAgTgzF
-gNXaO8hgDft2WzosgC/L+kWxKdE8xccHO3EPW+McNu3OXu8v0Yc4bhWInpIiQBi5
-G/WDX7rMf5d7v27//QF2W0ZemiTzIj5sIgch8spvmZphup1Aya2xi0/YD7DmlW3P
-9g6VtWzt2UvRfXhE/FTdKFHqlkxCbxZnr4EEVusclfLz0p6a/5RV3DC7tuawsjXs
-lyDaWg1j/4OSTfRxZ36PgGM5KsDtb3ag9SiGDcHsySPyJJjSjHXoMq26w+HRFymR
-26yvI6juoaXOhNH41S0QFqAP3NetOUzqpc4RDYo+tv3J9AxFjbW2wnGZbLibx/px
-4t9hdvSliE8EGBECAA8CGwwFAkFJlsEFCQG/U2cACgkQOfuToMruuMCA+wCfecrG
-HPe6Cu+9BnYkppoB21aHdXsAn0z7fNybhZk2MRalPjAfw6hvkIHouQINBEFJk7kQ
-CADFnWhgDH6XFSh4L5LGbH7dFtBLzeEbK3O5CuUD7nLjh2pnP+b8lYbpfsLNFaEY
-nC0FDi9esSqo12lC19JUDRCnhZJhbMLeHqIYSufcE6iNvcZZYvhJdFMV3K114Zsy
-OGmGm3FjE/Q/vcLCRndNqfcIznsVOBRX8BkuoA5/5TtMWZkcXvovCT66XmYIe2CD
-eK6KF0OqKKZeSOuvIkqx/dEiYh6jDymoeO5tLuE8m2bOjtnt2pPurOyPtGCUWs3H
-aRIVzUSPITZ/TGz1z0ebDzqDE7xOaxnqygdA1B7bscCnjZkPSuw6lMgvDaA6qsPp
-MEUy7XDn3Nmwsx/risGknZsTAAMFB/wOwwmKZFxjQhpDAIiViiQOqnOViFY331uY
-zV8THRnLmfxWhoGJo3XvvBrI1C+da3DuFRnWUnZiOpKs1xj8yjKtYyHYsiaWuoA7
-nI3XOziiD7nP5MEgE3xvF8+MkrbmOhTkseqTtKbOlnE8/J9AG9IcjfvVmN3LzXEN
-1W99XmGXzrMhGYLaDp6W+rvq5XkOkMDFbkf6W8fvdecJ5pIUpnGgKqDaRuJVP/+6
-gLgBPIiBzUyaqp3iRagqpdRNNeelYfuNZMLTqfZRd7ieoBYgD9tU3rEcIO6LDNLJ
-wKQqooBh1jUnjKWEDspzjPZuzqQ9YzvGD/GF/YeCFa1IWl0xnjCliE8EGBECAA8F
-AkFJk7kCGwwFCQJuRAAACgkQOfuToMruuMDx8gCfe7fK9K73XzecdjRrzBmIydx1
-4WoAnRVg+CXSToxAw2FD+XEfLSJlAg64uQGiBEFJlCkRBADcmN1wexDz/B7aog+t
-VnyEDLK4FT0Jg/cN0BUaOEsHbOM+ZnVQ+yYZyBBj+iGrnZUxN9h829p3ggV+X3pd
-flVG4V0lZ/733DIeiNbyjx1f81EZfYRdwDoZ2M0USYlzgUOZC5SCXskblkx+vQ3S
-JrTkg1cdFwwElkbTKQVvkl5bHwCgkPEEudGRjCwdiiyDk+lidptMavkEAK3dJiJk
-odmX1yluYR55bNRROSe0jXMx5CIuNBWs4jE/tk39KkuVbQnpGARyskMeA8tNSRdE
-WvWVRB6nnastv9rLtADCJvo39yjOmQTiz3wqEDQHOuOk6QMrWrUU03yhAljT9mLh
-08R616XZeX7wXbg9LxOhp5auK2zYiTsySWC3BACO0quIEGGnuo8CTcaAy7+WYCj7
-tvW6NS6p2yi3a4qqVxgKsmJpJnXms7dbhC2hhErxgu3N+/nzeVf9/uRiw04MGA1X
-6ezeCdF5N3N7mAzeSIcDwsrADakAivIcX9FOXvhrehT/fpZWPuvhQUUq4SlDTPl6
-1PK7BZVt+2VsESi764hPBBgRAgAPBQJBSZQpAhsCBQkCbkQAAAoJEDn7k6DK7rjA
-DHQAn0g8Bf9td6oQfX/EUNeWYugxNAizAJsEM9CuzlI0rCGsnpNShtz31mHv0A==
-=9KFd
+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
+zqOMMNOh4KXMYi8ANHEpRZ2z
+=oIge
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
==== //depot/projects/superpages/src/etc/pf.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $
+# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $
# $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $
#
# See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
@@ -72,6 +72,10 @@
#pass in on $ext_if proto { tcp, udp } from any to <foo> port 80 keep state
# pass incoming ports for ftp-proxy
+#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state
+
+# Alternate rule to pass incoming ports for ftp-proxy
+# NOTE: Please see pf.conf(5) BUGS section before using user/group rules.
#pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state
# assign packets to a queue.
==== //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#6 (text+ko) ====
@@ -145,7 +145,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.109 2006/01/27 04:42:10 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -1636,16 +1636,14 @@
static unsigned
arena_bins_search(arena_t *arena, size_t size)
{
- unsigned ret, minbin, i;
+ unsigned minbin, i;
int bit;
assert(QUANTUM_CEILING(size) == size);
assert((size >> opt_quantum_2pow) >= bin_shift);
- if (size > bin_maxsize) {
- ret = UINT_MAX;
- goto RETURN;
- }
+ if (size > bin_maxsize)
+ return (UINT_MAX);
minbin = (size >> opt_quantum_2pow) - bin_shift;
assert(minbin < NBINS);
@@ -1654,14 +1652,11 @@
& (UINT_MAX << (minbin % (sizeof(int) << 3))));
if (bit != 0) {
/* Usable allocation found. */
- ret = (i * (sizeof(int) << 3)) + bit - 1;
- goto RETURN;
+ return ((i * (sizeof(int) << 3)) + bit - 1);
}
}
- ret = UINT_MAX;
-RETURN:
- return (ret);
+ return (UINT_MAX);
}
static __inline void
@@ -2657,137 +2652,103 @@
static region_t *
arena_split_reg_alloc(arena_t *arena, size_t size, bool fit)
{
- region_t *ret;
+
+ if (arena->split == NULL)
+ return (NULL);
- if (arena->split != NULL) {
#ifdef MALLOC_STATS
- arena->stats.split.nrequests++;
+ arena->stats.split.nrequests++;
#endif
- if (region_next_size_get(&arena->split->sep) >= size) {
- if (fit) {
- size_t total_size;
+ if (region_next_size_get(&arena->split->sep) >= size) {
+ region_t *ret;
- /*
- * Use split, but try to use the beginning for
- * smaller regions, and the end for larger
- * regions. This reduces fragmentation in some
- * pathological use cases. It tends to group
- * short-lived (smaller) regions, which
- * increases the effectiveness of coalescing.
- */
+ if (fit) {
+ size_t total_size;
- total_size =
- region_next_size_get(&arena->split->sep);
- assert(size % quantum == 0);
+ /*
+ * Use split, but try to use the beginning for smaller
+ * regions, and the end for larger regions. This
+ * reduces fragmentation in some pathological use
+ * cases. It tends to group short-lived (smaller)
+ * regions, which increases the effectiveness of
+ * coalescing.
+ */
- if (total_size - size >= QUANTUM_CEILING(
- sizeof(region_small_sizer_t))) {
- if (size <= bin_maxsize) {
- region_t *next;
+ total_size = region_next_size_get(&arena->split->sep);
+ assert(size % quantum == 0);
- /*
- * Carve space from the
- * beginning of split.
- */
-
- /* ret. */
- ret = arena->split;
- region_next_size_set(&ret->sep,
- size);
- assert(region_next_free_get(
- &ret->sep) == false);
-
- /* next. */
- next = (region_t *)&((char *)
- ret)[size];
- region_next_size_set(&next->sep,
- total_size - size);
- assert(size >=
- QUANTUM_CEILING(sizeof(
- region_small_sizer_t)));
- region_prev_free_unset(
- &next->sep);
- region_next_free_unset(
- &next->sep);
-
- /* Update split. */
- arena->split = next;
- } else {
- region_t *prev;
- size_t prev_size;
-
- /*
- * Carve space from the end of
- * split.
- */
-
- /* prev. */
- prev_size = total_size - size;
- prev = arena->split;
- region_next_size_set(&prev->sep,
- prev_size);
- assert(prev_size >=
- QUANTUM_CEILING(sizeof(
- region_small_sizer_t)));
- assert(region_next_free_get(
- &prev->sep) == false);
-
- /* ret. */
- ret = (region_t *)&((char *)
- prev)[prev_size];
- region_next_size_set(&ret->sep,
- size);
- region_prev_free_unset(
- &ret->sep);
- region_next_free_unset(
- &ret->sep);
-
-#ifdef MALLOC_DEBUG
- {
+ if (total_size - size >=
+ QUANTUM_CEILING(sizeof(region_small_sizer_t))) {
+ if (size <= bin_maxsize) {
region_t *next;
- /* next. */
- next = (region_t *)&((char *) ret)
- [region_next_size_get(&ret->sep)];
- assert(region_prev_free_get(&next->sep)
- == false);
- }
-#endif
- }
-#ifdef MALLOC_STATS
- arena->stats.nsplit++;
-#endif
- } else {
/*
- * split is close enough to the right
- * size that there isn't enough room to
- * create a neighboring region.
+ * Carve space from the beginning of
+ * split.
*/
/* ret. */
ret = arena->split;
- arena->split = NULL;
+ region_next_size_set(&ret->sep, size);
assert(region_next_free_get(&ret->sep)
== false);
+ /* next. */
+ next = (region_t *)&((char *)ret)[size];
+ region_next_size_set(&next->sep,
+ total_size - size);
+ assert(size >= QUANTUM_CEILING(sizeof(
+ region_small_sizer_t)));
+ region_prev_free_unset(&next->sep);
+ region_next_free_unset(&next->sep);
+
+ /* Update split. */
+ arena->split = next;
+ } else {
+ region_t *prev;
+ size_t prev_size;
+
+ /* Carve space from the end of split. */
+
+ /* prev. */
+ prev_size = total_size - size;
+ prev = arena->split;
+ region_next_size_set(&prev->sep,
+ prev_size);
+ assert(prev_size >=
+ QUANTUM_CEILING(sizeof(
+ region_small_sizer_t)));
+ assert(region_next_free_get(
+ &prev->sep) == false);
+
+ /* ret. */
+ ret = (region_t *)&((char *)
+ prev)[prev_size];
+ region_next_size_set(&ret->sep, size);
+ region_prev_free_unset(&ret->sep);
+ region_next_free_unset(&ret->sep);
+
#ifdef MALLOC_DEBUG
{
- region_t *next;
+ region_t *next;
- /* next. */
- next = (region_t *)&((char *)
- ret)[region_next_size_get(
- &ret->sep)];
- assert(region_prev_free_get(
- &next->sep) == false);
+ /* next. */
+ next = (region_t *)&((char *)ret)
+ [region_next_size_get(&ret->sep)];
+ assert(region_prev_free_get(&next->sep)
+ == false);
}
#endif
}
#ifdef MALLOC_STATS
- arena->stats.split.nserviced++;
+ arena->stats.nsplit++;
#endif
} else {
- /* Don't fit to the allocation size. */
+ /*
+ * Split is close enough to the right size that
+ * there isn't enough room to create a
+ * neighboring region.
+ */
/* ret. */
ret = arena->split;
@@ -2800,35 +2761,59 @@
region_t *next;
/* next. */
- next = (region_t *) &((char *) ret)
- [region_next_size_get(&ret->sep)];
+ next = (region_t *)&((char *)
+ ret)[region_next_size_get(
+ &ret->sep)];
assert(region_prev_free_get(&next->sep)
== false);
}
#endif
}
- region_next_contig_set(&ret->sep);
- goto RETURN;
- } else if (size <= bin_maxsize) {
- region_t *reg;
+#ifdef MALLOC_STATS
+ arena->stats.split.nserviced++;
+#endif
+ } else {
+ /* Don't fit to the allocation size. */
+
+ /* ret. */
+ ret = arena->split;
+ arena->split = NULL;
+ assert(region_next_free_get(&ret->sep) == false);
+
+#ifdef MALLOC_DEBUG
+ {
+ region_t *next;
+
+ /* next. */
+ next = (region_t *) &((char *) ret)
+ [region_next_size_get(&ret->sep)];
+ assert(region_prev_free_get(&next->sep)
+ == false);
+ }
+#endif
+ }
+ region_next_contig_set(&ret->sep);
+ return (ret);
+ }
+ /* If we get here, split has failed to service the request. */
+
+ if (size <= bin_maxsize) {
+ region_t *reg;
- /*
- * The split region is too small to service a small
- * request. Clear split.
- */
+ /*
+ * The split region is too small to service a small request.
+ * Clear split.
+ */
- reg = arena->split;
- region_next_contig_set(®->sep);
+ reg = arena->split;
+ region_next_contig_set(®->sep);
- arena->split = NULL;
+ arena->split = NULL;
- arena_delay_cache(arena, reg);
- }
+ arena_delay_cache(arena, reg);
}
- ret = NULL;
-RETURN:
- return (ret);
+ return (NULL);
}
/*
@@ -2916,17 +2901,15 @@
#ifdef MALLOC_STATS
arena->stats.bins[bin].nserviced++;
#endif
- goto RETURN;
+ return (ret);
}
/* Look at frag to see whether it's large enough. */
ret = arena_frag_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
- ret = NULL;
-RETURN:
- return (ret);
+ return (NULL);
}
/* Look in large_regions for a large enough region. */
@@ -2946,10 +2929,8 @@
region_next_size_set(&key.sep, size);
node = RB_NFIND(region_tree_s, &arena->large_regions,
&key.next.u.l.node);
- if (node == NULL) {
- ret = NULL;
- goto RETURN;
- }
+ if (node == NULL)
+ return (NULL);
/* Cached large region found. */
ret = node->reg;
@@ -2973,7 +2954,6 @@
arena->stats.large.nserviced++;
#endif
-RETURN:
return (ret);
}
@@ -2985,10 +2965,8 @@
chunk_node_t *chunk;
chunk = chunk_alloc(chunk_size);
- if (chunk == NULL) {
- ret = NULL;
- goto RETURN;
- }
+ if (chunk == NULL)
+ return (NULL);
#ifdef MALLOC_DEBUG
{
@@ -3042,7 +3020,6 @@
if (fit)
arena_reg_fit(arena, size, ret, (arena->split == NULL));
-RETURN:
return (ret);
}
@@ -3063,16 +3040,16 @@
if (size <= bin_maxsize) {
ret = arena_bin_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
}
ret = arena_large_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
ret = arena_split_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
/*
* Only try allocating from frag here if size is large, since
@@ -3082,16 +3059,14 @@
if (size > bin_maxsize) {
ret = arena_frag_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
}
ret = arena_chunk_reg_alloc(arena, size, fit);
if (ret != NULL)
- goto RETURN;
+ return (ret);
- ret = NULL;
-RETURN:
- return (ret);
+ return (NULL);
}
static void *
@@ -3109,8 +3084,7 @@
quantum_size = region_ceiling(size);
if (quantum_size < size) {
/* size is large enough to cause size_t wrap-around. */
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
assert(quantum_size >= QUANTUM_CEILING(sizeof(region_small_sizer_t)));
@@ -3118,8 +3092,7 @@
reg = arena_reg_alloc(arena, quantum_size, true);
if (reg == NULL) {
malloc_mutex_unlock(&arena->mtx);
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
#ifdef MALLOC_STATS
@@ -3151,7 +3124,6 @@
memset(next->sep.prev_red, 0xa5, MALLOC_RED);
}
#endif
-RETURN:
return (ret);
}
@@ -3184,8 +3156,7 @@
quantum_size = region_ceiling(size);
if (quantum_size < size) {
/* size is large enough to cause size_t wrap-around. */
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
/*
@@ -3206,8 +3177,7 @@
if (alloc_size < quantum_size) {
/* size_t wrap-around occurred. */
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
malloc_mutex_lock(&arena->mtx);
@@ -3215,8 +3185,7 @@
reg = arena_reg_alloc(arena, alloc_size, false);
if (reg == NULL) {
malloc_mutex_unlock(&arena->mtx);
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
if (reg == old_split) {
/*
@@ -3360,7 +3329,6 @@
#endif
}
-RETURN:
assert(((uintptr_t)ret & (alignment - 1)) == 0);
return (ret);
}
@@ -3376,11 +3344,10 @@
ret = arena_malloc(arena, num * size);
if (ret == NULL)
- goto RETURN;
+ return (NULL);
memset(ret, 0, num * size);
-RETURN:
return (ret);
}
@@ -3559,7 +3526,6 @@
static bool
arena_new(arena_t *arena)
{
- bool ret;
unsigned i;
malloc_mutex_init(&arena->mtx);
@@ -3580,10 +3546,8 @@
assert(opt_ndelay > 0);
arena->delayed = (region_t **)base_alloc(opt_ndelay
* sizeof(region_t *));
- if (arena->delayed == NULL) {
- ret = true;
- goto RETURN;
- }
+ if (arena->delayed == NULL)
+ return (true);
memset(arena->delayed, 0, opt_ndelay * sizeof(region_t *));
arena->next_delayed = 0;
@@ -3597,9 +3561,7 @@
arena->magic = ARENA_MAGIC;
#endif
- ret = false;
-RETURN:
- return (ret);
+ return (false);
}
/* Create a new arena and insert it into the arenas array at index ind. */
@@ -3744,22 +3706,18 @@
chunk_size = CHUNK_CEILING(size);
if (chunk_size == 0) {
/* size is large enough to cause size_t wrap-around. */
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
/* Allocate a chunk node with which to track the chunk. */
node = base_chunk_node_alloc();
- if (node == NULL) {
- ret = NULL;
- goto RETURN;
- }
+ if (node == NULL)
+ return (NULL);
ret = chunk_alloc(chunk_size);
if (ret == NULL) {
base_chunk_node_dealloc(node);
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
/* Insert node into chunks. */
@@ -3776,7 +3734,6 @@
#endif
malloc_mutex_unlock(&chunks_mtx);
-RETURN:
return (ret);
}
@@ -3908,16 +3865,13 @@
* Allocate a chunk node with which to track the chunk.
*/
node = base_chunk_node_alloc();
- if (node == NULL) {
- ret = NULL;
- goto RETURN;
- }
+ if (node == NULL)
+ return (NULL);
ret = chunk_alloc(alloc_size);
if (ret == NULL) {
base_chunk_node_dealloc(node);
- ret = NULL;
- goto RETURN;
+ return (NULL);
}
offset = (uintptr_t)ret & (alignment - 1);
@@ -3967,11 +3921,8 @@
arena->stats.npalloc++;
malloc_mutex_unlock(&arena->mtx);
#endif
-RETURN:
- if (opt_junk) {
- if (ret != NULL)
- memset(ret, 0xa5, size);
- }
+ if (opt_junk)
+ memset(ret, 0xa5, size);
assert(((uintptr_t)ret & (alignment - 1)) == 0);
return (ret);
}
@@ -4087,7 +4038,7 @@
if (region_ceiling(size) <= (chunk_size >> 1)) {
ret = arena_malloc(arena, size);
if (ret == NULL)
- goto RETURN;
+ return (NULL);
if (opt_junk)
memset(ret, 0xa5, size);
@@ -4098,7 +4049,7 @@
} else {
ret = huge_malloc(arena, size);
if (ret == NULL)
- goto RETURN;
+ return (NULL);
if (opt_junk)
memset(ret, 0xa5, size);
@@ -4122,7 +4073,6 @@
arena->stats.nralloc++;
malloc_mutex_unlock(&arena->mtx);
#endif
-RETURN:
return (ret);
}
==== //depot/projects/superpages/src/lib/libdisk/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libdisk/Makefile,v 1.45 2006/01/12 07:26:57 ru Exp $
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.46 2006/01/27 16:32:13 harti Exp $
.if ${MACHINE_ARCH} == "ia64"
_open_disk= open_ia64_disk.c
@@ -22,6 +22,7 @@
CLEANFILES+= tmp.c tst01 tst01.o
NO_PROFILE=
+NO_PIC=
MAN= libdisk.3
==== //depot/projects/superpages/src/lib/libdisk/libdisk.3#3 (text+ko) ====
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.35 2005/11/24 10:30:44 ru Exp $
+.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.38 2006/01/27 16:38:05 harti Exp $
.\" "
-.Dd March 15, 1996
+.Dd January 27, 2006
.Dt LIBDISK 3
.Os
.Sh NAME
@@ -117,6 +117,13 @@
.Ft const char *
.Fn slice_type_name "int type" "int subtype"
.Sh DESCRIPTION
+.Nm libdisk
+.Sy is just for the use of
+.Xr sysinstall 8 .
+.Sy You should consider using
+.Xr libgeom 3
+.Sy instead.
+.Pp
The
.Nm libdisk
library provides an interface to the low-level disk slice and partition labels.
==== //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#2 (text+ko) ====
@@ -32,10 +32,10 @@
.\"
.\" Author: Archie Cobbs <archie@xxxxxxxxxxx>
.\"
-.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.31 2005/07/05 17:51:02 glebius Exp $
+.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.33 2006/01/27 11:56:59 glebius Exp $
.\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
.\"
-.Dd July 5, 2005
+.Dd January 27, 2006
.Dt NG_PPPOE 4
.Os
.Sh NAME
@@ -182,31 +182,51 @@
.Ed
.Bl -tag -width 3n
.It Dv NGM_PPPOE_GETMODE
-The
-.Nm
>>> TRUNCATED FOR MAIL (1000 lines) <<<
