PERFORCE change 34463 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Jul 13 22:41:52 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34463
Change 34463 by marcel at marcel_nfs on 2003/07/13 22:41:13
IFC @34462
Affected files ...
.. //depot/projects/ia64/lib/csu/ia64/crt1.c#6 delete
.. //depot/projects/ia64/sbin/dump/dump.8#17 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#52 integrate
.. //depot/projects/ia64/share/man/man4/fla.4#1 branch
.. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#6 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#10 integrate
.. //depot/projects/ia64/usr.sbin/apm/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/apm/zzz.8#1 branch
.. //depot/projects/ia64/usr.sbin/apm/zzz.sh#1 branch
.. //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#6 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#6 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.h#3 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#2 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/lp.cdefs.h#1 branch
.. //depot/projects/ia64/usr.sbin/lpr/common_source/lp.h#5 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.c#3 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.h#2 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/net.c#2 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/printcap.c#3 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/request.c#2 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#2 integrate
.. //depot/projects/ia64/usr.sbin/lpr/common_source/startdaemon.c#3 integrate
Differences ...
==== //depot/projects/ia64/sbin/dump/dump.8#17 (text+ko) ====
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)dump.8 8.3 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/dump/dump.8,v 1.58 2003/06/08 12:49:53 charnier Exp $
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.59 2003/07/14 02:22:55 grog Exp $
.\"
.Dd March 1, 2002
.Dt DUMP 8
@@ -133,11 +133,7 @@
This option overrides the calculation of tape size
based on length and density.
.It Fl b Ar blocksize
-The number of kilobytes per output block, except that if it is
-larger than 64, the command uses 64.
-(See the
-.Sx BUGS
-section.)
+The number of kilobytes per output block.
The default block size is 10.
.It Fl C Ar cachesize
Specify the cache size in megabytes.
@@ -445,14 +441,6 @@
reels already written just hang around until the entire tape
is written.
.Pp
-Currently,
-.Xr physio 9
-slices all requests into chunks of 64 KB.
-Therefore, it is
-impossible to use a larger output block size, so
-.Nm
-will prevent this from happening.
-.Pp
The
.Nm
utility with the
==== //depot/projects/ia64/share/man/man4/Makefile#52 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.213 2003/06/26 09:50:51 smkelly Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.214 2003/07/14 03:23:57 obrien Exp $
MAN= aac.4 \
acpi.4 \
@@ -59,6 +59,7 @@
fd.4 \
fdc.4 \
firewire.4 \
+ fla.4 \
fpa.4 \
fwe.4 \
fwohci.4 \
==== //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#6 (text+ko) ====
@@ -226,10 +226,6 @@
AcpiDmDecodeInternalObject (
ACPI_OPERAND_OBJECT *ObjDesc);
-void
-AcpiDmDecodeNode (
- ACPI_NAMESPACE_NODE *Node);
-
UINT32
AcpiDmBlockType (
ACPI_PARSE_OBJECT *Op);
==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.9 2003/07/13 22:57:16 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.10 2003/07/14 02:42:15 marcel Exp $
*/
/*
==== //depot/projects/ia64/usr.sbin/apm/Makefile#3 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.13 2003/04/04 17:49:12 obrien Exp $
+# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.14 2003/07/14 03:58:05 njl Exp $
PROG= apm
-LINKS= ${BINDIR}/apm ${BINDIR}/zzz
-MAN= apm.8
-MLINKS= apm.8 apmconf.8 apm.8 zzz.8
+SCRIPTS=zzz.sh
+MAN= apm.8 zzz.8
+MLINKS= apm.8 apmconf.8
.include <bsd.prog.mk>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#6 (text+ko) ====
@@ -36,13 +36,11 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*
+#if 0
static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
-*/
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.31 2002/07/12 01:37:06 gad Exp $";
-#endif /* not lint */
+#endif
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.32 2003/07/14 05:15:21 gad Exp $");
#include <sys/param.h>
#include <sys/stat.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#6 (text+ko) ====
@@ -31,10 +31,8 @@
* ------+---------+---------+---------+---------+---------+---------+---------*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.8 2003/06/12 03:49:40 gad Exp $";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.9 2003/07/14 05:15:21 gad Exp $");
/*
* ctlinfo - This collection of routines will know everything there is to
==== //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.h#3 (text+ko) ====
@@ -29,7 +29,7 @@
* official policies, either expressed or implied, of the FreeBSD Project.
*
* ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.2 2002/07/12 00:33:07 gad Exp $
+ * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.3 2003/07/14 05:15:21 gad Exp $
* ------+---------+---------+---------+---------+---------+---------+---------*
*/
@@ -64,7 +64,7 @@
struct cjprivate *cji_priv;
};
-#include <sys/cdefs.h>
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
__BEGIN_DECLS
void ctl_freeinf(struct cjobinfo *_cjinf);
==== //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#2 (text+ko) ====
@@ -31,13 +31,11 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*
+#if 0
static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
-*/
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.23 2001/08/30 09:26:54 kris Exp $";
-#endif /* not lint */
+#endif
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.24 2003/07/14 05:15:21 gad Exp $");
#include <sys/param.h>
#include <sys/stat.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/lp.h#5 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)lp.h 8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.23 2002/07/12 01:31:46 gad Exp $
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.24 2003/07/14 05:15:21 gad Exp $
*/
#include <sys/queue.h>
@@ -253,7 +253,7 @@
#define CMD_SHOWQ_LONG '\4'
#define CMD_RMJOB '\5'
-#include <sys/cdefs.h>
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
__BEGIN_DECLS
struct dirent;
==== //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.c#3 (text+ko) ====
@@ -32,10 +32,8 @@
* ------+---------+---------+---------+---------+---------+---------+---------*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.3 2002/08/11 13:05:29 schweikh Exp $";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.4 2003/07/14 05:15:21 gad Exp $");
/*
* movejobs.c - The lpc commands which move jobs around.
==== //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* or FreeBSD, Inc.
*
* ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.1 2002/07/17 00:51:19 gad Exp $
+ * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.2 2003/07/14 05:15:21 gad Exp $
* ------+---------+---------+---------+---------+---------+---------+---------*
*/
@@ -84,7 +84,8 @@
#define SCQ_JSORDER 0x0001 /* follow the user-specified order */
#define SCQ_QORDER 0x0002 /* the order of jobs in the queue */
-#include <sys/cdefs.h>
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+
__BEGIN_DECLS
struct jobqueue;
==== //depot/projects/ia64/usr.sbin/lpr/common_source/net.c#2 (text+ko) ====
@@ -38,10 +38,8 @@
* From: @(#)common.c 8.5 (Berkeley) 4/28/95
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.7 2001/06/15 22:03:03 gad Exp $";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.8 2003/07/14 05:15:21 gad Exp $");
#include <sys/param.h>
#include <sys/socket.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/printcap.c#3 (text+ko) ====
@@ -38,10 +38,8 @@
* From: @(#)common.c 8.5 (Berkeley) 4/28/95
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.9 2002/04/23 00:06:10 gad Exp $";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.10 2003/07/14 05:15:21 gad Exp $");
#include <errno.h>
#include <stdio.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/request.c#2 (text+ko) ====
@@ -29,8 +29,8 @@
static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.3 2000/12/30 20:56:04 phk Exp $";
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.4 2003/07/14 05:15:21 gad Exp $");
#include <sys/types.h>
#include <sys/stat.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#2 (text+ko) ====
@@ -31,13 +31,11 @@
* SUCH DAMAGE.
*/
-#ifndef lint
#if 0
static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.17 2001/06/15 22:03:03 gad Exp $";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.18 2003/07/14 05:15:21 gad Exp $");
#include <sys/param.h>
#include <sys/uio.h>
==== //depot/projects/ia64/usr.sbin/lpr/common_source/startdaemon.c#3 (text+ko) ====
@@ -31,14 +31,11 @@
* SUCH DAMAGE.
*/
-#ifndef lint
#if 0
static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.10 2002/04/23 02:42:04 gad Exp $";
-#endif /* not lint */
-
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.11 2003/07/14 05:15:21 gad Exp $");
#include <sys/param.h>
#include <sys/socket.h>
More information about the p4-projects
mailing list