Date: Tue, 16 Mar 2004 13:30:26 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49118 for review Message-ID: <200403162130.i2GLUQWX051825@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49118 Change 49118 by peter@peter_daintree on 2004/03/16 13:29:52 IFC @49115 Affected files ... .. //depot/projects/hammer/Makefile.inc1#43 integrate .. //depot/projects/hammer/bin/kill/kill.c#4 integrate .. //depot/projects/hammer/bin/pax/cache.c#4 integrate .. //depot/projects/hammer/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#9 integrate .. //depot/projects/hammer/etc/Makefile#24 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#22 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#19 integrate .. //depot/projects/hammer/etc/rc.d/mixer#1 branch .. //depot/projects/hammer/etc/rc.d/named#6 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk#1 branch .. //depot/projects/hammer/games/number/number.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#7 integrate .. //depot/projects/hammer/include/resolv.h#5 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.c#5 integrate .. //depot/projects/hammer/lib/libc/net/res_send.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getwc.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/putwc.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.3#3 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#5 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#9 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#14 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#12 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#12 integrate .. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#6 integrate .. //depot/projects/hammer/libexec/getty/chat.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#47 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#59 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#15 integrate .. //depot/projects/hammer/sbin/Makefile#24 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#14 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#4 integrate .. //depot/projects/hammer/sbin/raidctl/Makefile#2 delete .. //depot/projects/hammer/sbin/raidctl/raidctl.8#5 delete .. //depot/projects/hammer/sbin/raidctl/raidctl.c#3 delete .. //depot/projects/hammer/sbin/raidctl/rf_configure.c#3 delete .. //depot/projects/hammer/share/man/man4/Makefile#37 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#16 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/asc.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/gsc.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/le.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/rdp.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/hammer/share/man/man4/raid.4#5 delete .. //depot/projects/hammer/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/hammer/share/man/man9/vslock.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#16 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#10 integrate .. //depot/projects/hammer/share/syscons/keymaps/ru.koi8-r.win.kbd#1 branch .. //depot/projects/hammer/share/termcap/termcap.src#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#6 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#6 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#31 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#36 integrate .. //depot/projects/hammer/sys/conf/files#49 integrate .. //depot/projects/hammer/sys/conf/files.i386#24 integrate .. //depot/projects/hammer/sys/conf/files.pc98#24 integrate .. //depot/projects/hammer/sys/conf/options#33 integrate .. //depot/projects/hammer/sys/conf/options.i386#25 integrate .. //depot/projects/hammer/sys/conf/options.pc98#20 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#15 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#28 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#14 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#11 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#7 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#28 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#9 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#9 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#13 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#13 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#12 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_acctrace.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_alloclist.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_aselect.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_callback.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_chaindecluster.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_copyback.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_cvscan.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegrd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegwr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffrd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffwr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagfuncs.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagutils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugMem.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugprint.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_declusterPQ.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_diskqueue.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_disks.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_driver.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_engine.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dagfuncs.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_fifo.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#9 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_geniq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_interdecluster.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_invertq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_layout.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_map.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_mcpair.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_memchunk.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_nwayxor.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_options.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylog.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogDiskMgr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogging.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityloggingdags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityscan.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdeg.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdegdags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_psstatus.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid0.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid1.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid4.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5_rotatedspare.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconbuffer.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconmap.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconstruct.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconutil.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_revent.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_shutdown.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_sstf.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_states.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_stripelocks.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_strutils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_threadstuff.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_threadstuff.h#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_types.h#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_utils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/hammer/sys/dev/re/if_re.c#10 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#10 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#12 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#7 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#13 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#30 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#30 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#10 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#11 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#9 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#36 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/hammer/sys/i386/include/cdk.h#2 delete .. //depot/projects/hammer/sys/i386/include/gsc.h#2 delete .. //depot/projects/hammer/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/hammer/sys/i386/include/spigot.h#2 delete .. //depot/projects/hammer/sys/i386/include/wtio.h#2 delete .. //depot/projects/hammer/sys/i386/isa/README.le#2 delete .. //depot/projects/hammer/sys/i386/isa/README.stl#2 delete .. //depot/projects/hammer/sys/i386/isa/asc.c#6 delete .. //depot/projects/hammer/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ctx.c#6 delete .. //depot/projects/hammer/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gpib.c#7 delete .. //depot/projects/hammer/sys/i386/isa/gpib.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gsc.c#5 delete .. //depot/projects/hammer/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ic/lemac.h#2 delete .. //depot/projects/hammer/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#10 delete .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#12 delete .. //depot/projects/hammer/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/isa_compat.c#6 delete .. //depot/projects/hammer/sys/i386/isa/isa_device.h#3 delete .. //depot/projects/hammer/sys/i386/isa/istallion.c#6 delete .. //depot/projects/hammer/sys/i386/isa/pcf.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/spigot.c#7 delete .. //depot/projects/hammer/sys/i386/isa/stallion.c#8 delete .. //depot/projects/hammer/sys/i386/isa/wt.c#7 delete .. //depot/projects/hammer/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#16 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#12 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#26 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#27 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/hammer/sys/modules/Makefile#38 integrate .. //depot/projects/hammer/sys/modules/arl/Makefile#1 branch .. //depot/projects/hammer/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/raidframe/Makefile#3 delete .. //depot/projects/hammer/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/hammer/sys/net/if_tap.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#11 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#30 integrate .. //depot/projects/hammer/sys/pci/if_de.c#12 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#16 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#29 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#17 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#23 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#21 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#17 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#18 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#15 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#16 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#16 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#31 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/hammer/sys/sys/ata.h#7 integrate .. //depot/projects/hammer/sys/sys/limits.h#7 integrate .. //depot/projects/hammer/sys/sys/mount.h#13 integrate .. //depot/projects/hammer/sys/sys/sf_buf.h#3 integrate .. //depot/projects/hammer/sys/sys/syscall.h#26 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#26 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#14 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#26 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#10 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#25 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#19 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/current.rc#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#8 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#18 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#11 integrate .. //depot/projects/hammer/usr.bin/Makefile#26 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#17 integrate .. //depot/projects/hammer/usr.bin/finger/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/finger/finger.c#5 integrate .. //depot/projects/hammer/usr.bin/finger/finger.h#2 integrate .. //depot/projects/hammer/usr.bin/finger/lprint.c#4 integrate .. //depot/projects/hammer/usr.bin/mkstr/mkstr.c#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.c#3 integrate .. //depot/projects/hammer/usr.bin/sasc/INSTALL#2 delete .. //depot/projects/hammer/usr.bin/sasc/Makefile#2 delete .. //depot/projects/hammer/usr.bin/sasc/README#2 delete .. //depot/projects/hammer/usr.bin/sasc/sasc.1#2 delete .. //depot/projects/hammer/usr.bin/sasc/sasc.c#2 delete .. //depot/projects/hammer/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/hammer/usr.sbin/Makefile#45 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.8#7 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#4 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.8#1 branch .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.c#1 branch .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/hammer/usr.sbin/sgsc/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/sgsc/sgsc.1#2 delete .. //depot/projects/hammer/usr.sbin/sgsc/sgsc.c#2 delete .. //depot/projects/hammer/usr.sbin/stallion/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/Makefile.inc#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/2681.sys.uu#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/cdk.sys.uu#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/stl.4#3 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/stlload.8#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/stlload.c#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/stlstats.8#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/stlstats.c#3 delete .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#13 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -261,7 +261,7 @@ mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include + -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo ==== //depot/projects/hammer/bin/kill/kill.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.17 2004/01/28 19:04:14 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.18 2004/03/15 04:10:29 jmallett Exp $"); #include <ctype.h> #include <err.h> @@ -53,10 +53,10 @@ #include <stdlib.h> #include <string.h> -void nosig(char *); -void printsignals(FILE *); -int signame_to_signum(char *); -void usage(void); +static void nosig(const char *); +static void printsignals(FILE *); +static int signame_to_signum(const char *); +static void usage(void); int main(int argc, char *argv[]) @@ -139,8 +139,8 @@ exit(errors); } -int -signame_to_signum(char *sig) +static int +signame_to_signum(const char *sig) { int n; @@ -153,8 +153,8 @@ return (-1); } -void -nosig(char *name) +static void +nosig(const char *name) { warnx("unknown signal %s; valid signals:", name); @@ -162,7 +162,7 @@ exit(1); } -void +static void printsignals(FILE *fp) { int n; @@ -176,7 +176,7 @@ } } -void +static void usage(void) { ==== //depot/projects/hammer/bin/pax/cache.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.19 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.20 2004/03/16 08:33:33 cperciva Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -203,7 +203,7 @@ ++pwopn; } if (ptr == NULL) - ptr = (UIDC *)malloc(sizeof(UIDC)); + ptr = uidtb[uid % UID_SZ] = (UIDC *)malloc(sizeof(UIDC)); if ((pw = getpwuid(uid)) == NULL) { /* @@ -274,7 +274,7 @@ ++gropn; } if (ptr == NULL) - ptr = (GIDC *)malloc(sizeof(GIDC)); + ptr = gidtb[gid % GID_SZ] = (GIDC *)malloc(sizeof(GIDC)); if ((gr = getgrgid(gid)) == NULL) { /* ==== //depot/projects/hammer/contrib/pf/authpf/authpf.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: authpf.c,v 1.68 2003/08/21 19:13:23 frantzen Exp $ */ /* @@ -26,7 +25,10 @@ * SUCH DAMAGE. */ -#include <sys/types.h> +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + +#include <sys/param.h> #include <sys/file.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -50,9 +52,6 @@ #include "pathnames.h" -#if defined(__FreeBSD__) -#define __dead __volatile -#endif extern int symset(const char *, const char *, int); static int read_config(FILE *); @@ -77,7 +76,11 @@ volatile sig_atomic_t want_death; static void need_death(int signo); +#ifdef __FreeBSD__ +static __dead2 void do_death(int); +#else static __dead void do_death(int); +#endif /* * User shell for authenticating gateways. Sole purpose is to allow @@ -289,9 +292,8 @@ sleep(180); /* them lusers read reaaaaal slow */ die: do_death(0); -#if defined(__FreeBSD__) - return 0; /* gcc hack to prevent warning */ -#endif + + /* NOTREACHED */ } /* @@ -730,7 +732,11 @@ /* * function that removes our stuff when we go away. */ +#ifdef __FreeBSD__ +static __dead2 void +#else static __dead void +#endif do_death(int active) { int ret = 0; ==== //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: ftp-proxy.c,v 1.33 2003/08/22 21:50:34 david Exp $ */ /* @@ -31,6 +30,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + /* * ftp proxy, Originally based on juniper_ftp_proxy from the Obtuse * Systems juniper firewall, written by Dan Boulet <danny@obtuse.com> @@ -69,7 +71,6 @@ */ #include <sys/param.h> -#include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> ==== //depot/projects/hammer/contrib/pf/pfctl/parse.y#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -26,6 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ %{ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.5 2004/03/16 17:24:06 obrien Exp $"); + #include <sys/types.h> #include <sys/socket.h> #include <net/if.h> @@ -49,6 +51,7 @@ #include <string.h> #include <ctype.h> #include <err.h> +#include <limits.h> #include <pwd.h> #include <grp.h> #include <md5.h> @@ -56,7 +59,7 @@ #include "pfctl_parser.h" #include "pfctl.h" -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #define HTONL(x) (x) = htonl((__uint32_t)(x)) #endif ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl.c,v 1.188 2003/08/29 21:47:36 cedric Exp $ */ /* @@ -31,18 +30,15 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> #include <netinet/in.h> -#if defined(__FreeBSD__) -#include <inttypes.h> -#include <net/route.h> -#else -#define PRIu64 "llu" -#endif #include <net/pfvar.h> #include <arpa/inet.h> #include <altq/altq.h> @@ -201,7 +197,7 @@ if (ioctl(dev, DIOCSTART)) { if (errno == EEXIST) errx(1, "pf already enabled"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ else if (errno == ESRCH) errx(1, "pfil registeration failed"); #endif @@ -554,10 +550,11 @@ rule->qname, rule->qid, rule->pqname, rule->pqid); } if (opts & PF_OPT_VERBOSE) - printf(" [ Evaluations: %-8"PRIu64" Packets: %-8"PRIu64" " - "Bytes: %-10"PRIu64" States: %-6u]\n", - rule->evaluations, rule->packets, - rule->bytes, rule->states); + printf(" [ Evaluations: %-8llu Packets: %-8llu " + "Bytes: %-10llu States: %-6u]\n", + (unsigned long long)rule->evaluations, + (unsigned long long)rule->packets, + (unsigned long long)rule->bytes, rule->states); } int @@ -619,9 +616,10 @@ case 1: if (pr.rule.label[0]) { printf("%s ", pr.rule.label); - printf("%"PRIu64" %"PRIu64" %"PRIu64"\n", - pr.rule.evaluations, pr.rule.packets, - pr.rule.bytes); + printf("%llu %llu %llu\n", + (unsigned long long)pr.rule.evaluations, + (unsigned long long)pr.rule.packets, + (unsigned long long)pr.rule.bytes); } break; default: @@ -651,9 +649,10 @@ case 1: if (pr.rule.label[0]) { printf("%s ", pr.rule.label); - printf("%"PRIu64" %"PRIu64" %"PRIu64"\n", - pr.rule.evaluations, pr.rule.packets, - pr.rule.bytes); + printf("%llu %llu %llu\n", + (unsigned long long)pr.rule.evaluations, + (unsigned long long)pr.rule.packets, + (unsigned long long)pr.rule.bytes); } break; default: ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl.h,v 1.25 2003/08/29 21:47:36 cedric Exp $ */ /* @@ -29,6 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.4 2004/03/16 17:24:06 obrien Exp $ */ #ifndef _PFCTL_H_ @@ -83,7 +83,7 @@ int pfctl_show_altq(int, int, int); void warn_namespace_collision(const char *); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ extern int altqsupport; #endif ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -19,12 +18,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.5 2004/03/16 17:24:06 obrien Exp $"); + +#include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> -#if !defined(__FreeBSD__) -#include <sys/limits.h> -#endif #include <net/if.h> #include <netinet/in.h> @@ -32,6 +31,7 @@ #include <err.h> #include <errno.h> +#include <limits.h> #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -77,7 +77,7 @@ double); static double sc_x2y(struct service_curve *, double); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ u_int32_t getifspeed(int, char *); #else u_int32_t getifspeed(char *); @@ -246,7 +246,7 @@ if (bw->bw_absolute > 0) pa->ifbandwidth = bw->bw_absolute; else -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ if ((rate = getifspeed(pf->dev, pa->ifname)) == 0) { #else if ((rate = getifspeed(pa->ifname)) == 0) { @@ -880,13 +880,8 @@ /* * admission control using generalized service curve */ -#if defined(__FreeBSD__) -#if defined(INFINITY) -#undef INFINITY -#endif +#ifndef INFINITY #define INFINITY HUGE_VAL /* positive infinity defined in <math.h> */ -#else -#define INFINITY HUGE_VAL /* positive infinity defined in <math.h> */ #endif /* add a new service curve to a generalized service curve */ @@ -1088,10 +1083,10 @@ return (buf); } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * XXX - * FreeBSD do not have SIOCGIFDATA. + * FreeBSD does not have SIOCGIFDATA. * To emulate this, DIOCGIFSPEED ioctl added to pf. */ u_int32_t ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_parser.c,v 1.175 2003/09/18 20:27:58 cedric Exp $ */ /* @@ -31,6 +30,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include <sys/types.h> #include <sys/socket.h> #include <net/if.h> @@ -46,19 +48,13 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> +#include <limits.h> #include <netdb.h> #include <stdarg.h> #include <errno.h> #include <err.h> #include <ifaddrs.h> -#if defined(__FreeBSD__) -#include <inttypes.h> -#else -#define PRIu64 "llu" -#define PRId64 "lld" -#endif - #include "pfctl_parser.h" #include "pfctl.h" @@ -511,30 +507,32 @@ if (s->ifname[0] != 0) { printf("Interface Stats for %-16s %5s %16s\n", s->ifname, "IPv4", "IPv6"); - printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes In", - s->bcounters[0][0], s->bcounters[1][0]); - printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes Out", - s->bcounters[0][1], s->bcounters[1][1]); + printf(" %-25s %14llu %16llu\n", "Bytes In", + (unsigned long long)s->bcounters[0][0], + (unsigned long long)s->bcounters[1][0]); + printf(" %-25s %14llu %16llu\n", "Bytes Out", + (unsigned long long)s->bcounters[0][1], + (unsigned long long)s->bcounters[1][1]); printf(" Packets In\n"); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed", - s->pcounters[0][0][PF_PASS], - s->pcounters[1][0][PF_PASS]); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Blocked", - s->pcounters[0][0][PF_DROP], - s->pcounters[1][0][PF_DROP]); + printf(" %-23s %14llu %16llu\n", "Passed", + (unsigned long long)s->pcounters[0][0][PF_PASS], + (unsigned long long)s->pcounters[1][0][PF_PASS]); + printf(" %-23s %14llu %16llu\n", "Blocked", + (unsigned long long)s->pcounters[0][0][PF_DROP], + (unsigned long long)s->pcounters[1][0][PF_DROP]); printf(" Packets Out\n"); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed", - s->pcounters[0][1][PF_PASS], - s->pcounters[1][1][PF_PASS]); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n\n", "Blocked", - s->pcounters[0][1][PF_DROP], - s->pcounters[1][1][PF_DROP]); + printf(" %-23s %14llu %16llu\n", "Passed", + (unsigned long long)s->pcounters[0][1][PF_PASS], + (unsigned long long)s->pcounters[1][1][PF_PASS]); + printf(" %-23s %14llu %16llu\n\n", "Blocked", + (unsigned long long)s->pcounters[0][1][PF_DROP], + (unsigned long long)s->pcounters[1][1][PF_DROP]); } printf("%-27s %14s %16s\n", "State Table", "Total", "Rate"); printf(" %-25s %14u %14s\n", "current entries", s->states, ""); for (i = 0; i < FCNT_MAX; i++) { - printf(" %-25s %14"PRIu64" ", pf_fcounters[i], - s->fcounters[i]); + printf(" %-25s %14llu ", pf_fcounters[i], + (unsigned long long)s->fcounters[i]); if (runtime > 0) printf("%14.1f/s\n", (double)s->fcounters[i] / (double)runtime); @@ -543,8 +541,8 @@ } printf("Counters\n"); for (i = 0; i < PFRES_MAX; i++) { - printf(" %-25s %14"PRIu64" ", pf_reasons[i], - s->counters[i]); + printf(" %-25s %14llu ", pf_reasons[i], + (unsigned long long)s->counters[i]); if (runtime > 0) printf("%14.1f/s\n", (double)s->counters[i] / (double)runtime); ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_parser.h,v 1.67 2003/08/21 19:12:09 frantzen Exp $ */ /* @@ -29,6 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.4 2004/03/16 17:24:06 obrien Exp $ */ #ifndef _PFCTL_PARSER_H_ @@ -135,7 +135,7 @@ } data; }; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * XXX * Absolutely this is not correct location to define this. ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_qstats.c,v 1.24 2003/07/31 09:46:08 kjc Exp $ */ /* @@ -17,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -37,12 +39,6 @@ #include <altq/altq_priq.h> #include <altq/altq_hfsc.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403162130.i2GLUQWX051825>