Date: Sun, 18 Dec 2011 00:31:07 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r228676 - in projects/geom-events: . bin/chio bin/ed bin/stty cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libdtrace/common cddl/con... Message-ID: <201112180031.pBI0V7LI083881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev (ports committer) Date: Sun Dec 18 00:31:06 2011 New Revision: 228676 URL: http://svn.freebsd.org/changeset/base/228676 Log: Merge r228674 from head Added: projects/geom-events/lib/clang/include/MipsGenCodeEmitter.inc - copied unchanged from r228675, head/lib/clang/include/MipsGenCodeEmitter.inc projects/geom-events/lib/libc/stdlib/at_quick_exit.3 - copied unchanged from r228675, head/lib/libc/stdlib/at_quick_exit.3 projects/geom-events/lib/libc/stdlib/quick_exit.3 - copied unchanged from r228675, head/lib/libc/stdlib/quick_exit.3 projects/geom-events/lib/libc/stdlib/quick_exit.c - copied unchanged from r228675, head/lib/libc/stdlib/quick_exit.c projects/geom-events/sbin/ifconfig/carp.c - copied unchanged from r228675, head/sbin/ifconfig/carp.c projects/geom-events/share/man/man4/eventtimers.4 - copied unchanged from r228675, head/share/man/man4/eventtimers.4 projects/geom-events/share/man/man4/viawd.4 - copied unchanged from r228675, head/share/man/man4/viawd.4 projects/geom-events/share/man/man9/shm_map.9 - copied unchanged from r228675, head/share/man/man9/shm_map.9 projects/geom-events/sys/dev/cxgbe/firmware/ - copied from r228675, head/sys/dev/cxgbe/firmware/ projects/geom-events/sys/dev/fb/splash_txt.c - copied unchanged from r228675, head/sys/dev/fb/splash_txt.c projects/geom-events/sys/dev/viawd/ - copied from r228675, head/sys/dev/viawd/ projects/geom-events/sys/modules/carp/ - copied from r228675, head/sys/modules/carp/ projects/geom-events/sys/modules/cxgbe/firmware/ - copied from r228675, head/sys/modules/cxgbe/firmware/ projects/geom-events/sys/modules/splash/txt/ - copied from r228675, head/sys/modules/splash/txt/ projects/geom-events/sys/modules/usb/avr32dci/ - copied from r228675, head/sys/modules/usb/avr32dci/ projects/geom-events/sys/modules/viawd/ - copied from r228675, head/sys/modules/viawd/ projects/geom-events/sys/sys/_kstack_cache.h - copied unchanged from r228675, head/sys/sys/_kstack_cache.h projects/geom-events/tools/regression/pipe/pipe-reverse2.c - copied unchanged from r228675, head/tools/regression/pipe/pipe-reverse2.c projects/geom-events/tools/regression/usr.bin/make/execution/joberr/ - copied from r228675, head/tools/regression/usr.bin/make/execution/joberr/ projects/geom-events/usr.sbin/cpucontrol/via.c - copied unchanged from r228675, head/usr.sbin/cpucontrol/via.c projects/geom-events/usr.sbin/cpucontrol/via.h - copied unchanged from r228675, head/usr.sbin/cpucontrol/via.h Deleted: projects/geom-events/sbin/ifconfig/ifcarp.c projects/geom-events/share/man/man7/eventtimers.7 projects/geom-events/sys/dev/cxgbe/common/t4fw_interface.h projects/geom-events/sys/fs/ext2fs/ext2_readwrite.c projects/geom-events/sys/libkern/gets.c projects/geom-events/sys/modules/if_carp/ Modified: projects/geom-events/ObsoleteFiles.inc projects/geom-events/UPDATING projects/geom-events/bin/chio/chio.c projects/geom-events/bin/ed/io.c projects/geom-events/bin/ed/main.c projects/geom-events/bin/stty/modes.c projects/geom-events/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c projects/geom-events/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c projects/geom-events/contrib/bsnmp/snmp_mibII/mibII.c projects/geom-events/contrib/bsnmp/snmpd/snmpmod.h projects/geom-events/contrib/bzip2/bzip2recover.c projects/geom-events/contrib/ee/ee.c projects/geom-events/contrib/file/softmagic.c projects/geom-events/contrib/gcclibs/libcpp/include/cpplib.h projects/geom-events/contrib/gcclibs/libcpp/init.c projects/geom-events/contrib/gcclibs/libcpp/internal.h projects/geom-events/contrib/gcclibs/libcpp/macro.c projects/geom-events/contrib/gperf/src/output.cc projects/geom-events/contrib/groff/tmac/doc-common projects/geom-events/contrib/groff/tmac/doc-syms projects/geom-events/contrib/groff/tmac/doc.tmac projects/geom-events/contrib/groff/tmac/groff_mdoc.man projects/geom-events/contrib/less/command.c projects/geom-events/contrib/less/prompt.c projects/geom-events/contrib/libstdc++/include/debug/map.h projects/geom-events/contrib/libstdc++/include/debug/multimap.h projects/geom-events/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp projects/geom-events/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp projects/geom-events/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/geom-events/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp projects/geom-events/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp projects/geom-events/contrib/llvm/lib/Target/ARM/ARMCallingConv.td projects/geom-events/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp projects/geom-events/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp projects/geom-events/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/geom-events/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td projects/geom-events/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp projects/geom-events/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td projects/geom-events/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp projects/geom-events/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td projects/geom-events/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td projects/geom-events/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td projects/geom-events/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp projects/geom-events/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp projects/geom-events/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp projects/geom-events/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp projects/geom-events/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td projects/geom-events/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h projects/geom-events/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h projects/geom-events/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/geom-events/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp projects/geom-events/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp projects/geom-events/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h projects/geom-events/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp projects/geom-events/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/geom-events/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/geom-events/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/geom-events/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/geom-events/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp projects/geom-events/contrib/openpam/lib/openpam_configure.c projects/geom-events/contrib/pnpinfo/pnpinfo.c projects/geom-events/contrib/telnet/libtelnet/sra.c projects/geom-events/contrib/telnet/telnet/utilities.c projects/geom-events/contrib/telnet/telnetd/utility.c projects/geom-events/contrib/tzcode/zic/zdump.c projects/geom-events/etc/network.subr projects/geom-events/etc/rc.d/Makefile projects/geom-events/games/factor/factor.c projects/geom-events/gnu/usr.bin/binutils/libbinutils/Makefile projects/geom-events/gnu/usr.bin/groff/tmac/mdoc.local projects/geom-events/include/netdb.h projects/geom-events/include/regex.h projects/geom-events/include/signal.h projects/geom-events/include/stdbool.h projects/geom-events/include/stdio.h projects/geom-events/include/stdlib.h projects/geom-events/kerberos5/Makefile.inc projects/geom-events/lib/clang/include/clang/Basic/Version.inc projects/geom-events/lib/clang/libllvmmipscodegen/Makefile projects/geom-events/lib/libc/gen/getosreldate.c projects/geom-events/lib/libc/net/getifaddrs.c projects/geom-events/lib/libc/net/sctp_sys_calls.c projects/geom-events/lib/libc/resolv/res_send.c projects/geom-events/lib/libc/rpc/crypt_client.c projects/geom-events/lib/libc/stdlib/Makefile.inc projects/geom-events/lib/libc/stdlib/Symbol.map projects/geom-events/lib/libc/stdlib/atexit.3 projects/geom-events/lib/libc/stdlib/exit.3 projects/geom-events/lib/libc/stdlib/malloc.c projects/geom-events/lib/libc/sys/kqueue.2 projects/geom-events/lib/libedit/histedit.h projects/geom-events/lib/libipsec/policy_token.l projects/geom-events/lib/libpmc/libpmc.c projects/geom-events/lib/libsm/Makefile projects/geom-events/lib/libthr/arch/amd64/include/pthread_md.h projects/geom-events/lib/libthr/arch/i386/include/pthread_md.h projects/geom-events/lib/libthread_db/Makefile projects/geom-events/lib/libufs/block.c projects/geom-events/lib/libutil/gr_util.c projects/geom-events/lib/libutil/libutil.h projects/geom-events/lib/libutil/pw_util.c projects/geom-events/libexec/bootpd/bootpgw/bootpgw.c projects/geom-events/libexec/bootpd/tools/bootptest/print-bootp.c projects/geom-events/libexec/comsat/comsat.c projects/geom-events/libexec/getty/chat.c projects/geom-events/libexec/mail.local/Makefile projects/geom-events/libexec/pppoed/pppoed.c projects/geom-events/libexec/rbootd/utils.c projects/geom-events/libexec/rtld-elf/amd64/reloc.c projects/geom-events/libexec/rtld-elf/arm/reloc.c projects/geom-events/libexec/rtld-elf/i386/reloc.c projects/geom-events/libexec/rtld-elf/ia64/reloc.c projects/geom-events/libexec/rtld-elf/mips/reloc.c projects/geom-events/libexec/rtld-elf/powerpc/reloc.c projects/geom-events/libexec/rtld-elf/powerpc64/reloc.c projects/geom-events/libexec/rtld-elf/rtld.c projects/geom-events/libexec/rtld-elf/rtld.h projects/geom-events/libexec/rtld-elf/sparc64/reloc.c projects/geom-events/libexec/smrsh/Makefile projects/geom-events/libexec/ypxfr/ypxfr_getmap.c projects/geom-events/libexec/ypxfr/ypxfr_main.c projects/geom-events/libexec/ypxfr/ypxfr_misc.c projects/geom-events/sbin/atm/atmconfig/diag.c projects/geom-events/sbin/bsdlabel/bsdlabel.c projects/geom-events/sbin/camcontrol/camcontrol.c projects/geom-events/sbin/camcontrol/fwdownload.c projects/geom-events/sbin/camcontrol/modeedit.c projects/geom-events/sbin/devd/devd.conf.5 projects/geom-events/sbin/devd/devd.hh projects/geom-events/sbin/dhclient/clparse.c projects/geom-events/sbin/dhclient/dhclient-script projects/geom-events/sbin/dhclient/parse.c projects/geom-events/sbin/dumpfs/dumpfs.c projects/geom-events/sbin/fsdb/fsdbutil.c projects/geom-events/sbin/gbde/Makefile projects/geom-events/sbin/hastd/control.c projects/geom-events/sbin/hastd/hast_checksum.c projects/geom-events/sbin/hastd/secondary.c projects/geom-events/sbin/ifconfig/Makefile projects/geom-events/sbin/ifconfig/af_inet.c projects/geom-events/sbin/ifconfig/af_inet6.c projects/geom-events/sbin/ifconfig/ifconfig.8 projects/geom-events/sbin/ifconfig/ifconfig.c projects/geom-events/sbin/ifconfig/ifconfig.h projects/geom-events/sbin/ifconfig/ifvlan.c projects/geom-events/sbin/ipf/Makefile.inc projects/geom-events/sbin/rcorder/rcorder.c projects/geom-events/sbin/reboot/reboot.c projects/geom-events/sbin/routed/rtquery/Makefile projects/geom-events/secure/lib/libcrypto/Makefile projects/geom-events/share/examples/scsi_target/scsi_cmds.c projects/geom-events/share/examples/scsi_target/scsi_target.c projects/geom-events/share/man/man4/Makefile projects/geom-events/share/man/man4/ahci.4 projects/geom-events/share/man/man4/altq.4 projects/geom-events/share/man/man4/atrtc.4 projects/geom-events/share/man/man4/attimer.4 projects/geom-events/share/man/man4/carp.4 projects/geom-events/share/man/man4/cxgbe.4 projects/geom-events/share/man/man4/ddb.4 projects/geom-events/share/man/man4/et.4 projects/geom-events/share/man/man4/hpet.4 projects/geom-events/share/man/man4/splash.4 projects/geom-events/share/man/man4/targ.4 projects/geom-events/share/man/man5/make.conf.5 projects/geom-events/share/man/man5/periodic.conf.5 projects/geom-events/share/man/man5/rc.conf.5 projects/geom-events/share/man/man7/Makefile projects/geom-events/share/man/man8/yp.8 projects/geom-events/share/man/man9/Makefile projects/geom-events/share/man/man9/rtalloc.9 projects/geom-events/share/man/man9/sbuf.9 projects/geom-events/share/misc/committers-src.dot projects/geom-events/share/mk/bsd.lib.mk projects/geom-events/share/mk/bsd.sys.mk projects/geom-events/sys/amd64/conf/NOTES projects/geom-events/sys/amd64/include/_types.h projects/geom-events/sys/arm/arm/irq_dispatch.S projects/geom-events/sys/arm/arm/pmap.c projects/geom-events/sys/arm/arm/vm_machdep.c projects/geom-events/sys/arm/econa/ehci_ebus.c projects/geom-events/sys/arm/econa/ohci_ec.c projects/geom-events/sys/arm/include/_types.h projects/geom-events/sys/arm/include/pmap.h projects/geom-events/sys/boot/arm/at91/libat91/sd-card.c projects/geom-events/sys/boot/forth/loader.conf projects/geom-events/sys/cam/scsi/scsi_sa.c projects/geom-events/sys/cam/scsi/scsi_target.c projects/geom-events/sys/cam/scsi/scsi_xpt.c projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/geom-events/sys/conf/NOTES projects/geom-events/sys/conf/files projects/geom-events/sys/conf/files.amd64 projects/geom-events/sys/conf/files.i386 projects/geom-events/sys/conf/kmod.mk projects/geom-events/sys/contrib/ngatm/netnatm/msg/uni_ie.c projects/geom-events/sys/ddb/db_command.c projects/geom-events/sys/ddb/db_ps.c projects/geom-events/sys/ddb/db_thread.c projects/geom-events/sys/ddb/ddb.h projects/geom-events/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l projects/geom-events/sys/dev/aic7xxx/aicasm/aicasm_scan.l projects/geom-events/sys/dev/an/if_an.c projects/geom-events/sys/dev/ata/ata-pci.h projects/geom-events/sys/dev/ata/chipsets/ata-intel.c projects/geom-events/sys/dev/ath/ath_hal/ar5416/ar2133.c projects/geom-events/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/geom-events/sys/dev/ath/ath_hal/ar9002/ar9280.c projects/geom-events/sys/dev/ath/ath_hal/ar9002/ar9285.c projects/geom-events/sys/dev/ath/ath_hal/ar9002/ar9287.c projects/geom-events/sys/dev/ath/if_ath.c projects/geom-events/sys/dev/bce/if_bce.c projects/geom-events/sys/dev/bce/if_bcereg.h projects/geom-events/sys/dev/bge/if_bge.c projects/geom-events/sys/dev/bge/if_bgereg.h projects/geom-events/sys/dev/bwi/if_bwi.c projects/geom-events/sys/dev/bwn/if_bwn.c projects/geom-events/sys/dev/bwn/if_bwnvar.h projects/geom-events/sys/dev/bxe/bxe_reg.h projects/geom-events/sys/dev/cfe/cfe_console.c projects/geom-events/sys/dev/cm/smc90cx6.c projects/geom-events/sys/dev/cpuctl/cpuctl.c projects/geom-events/sys/dev/cxgbe/adapter.h projects/geom-events/sys/dev/cxgbe/common/common.h projects/geom-events/sys/dev/cxgbe/common/t4_hw.c projects/geom-events/sys/dev/cxgbe/common/t4_hw.h projects/geom-events/sys/dev/cxgbe/offload.h projects/geom-events/sys/dev/cxgbe/osdep.h projects/geom-events/sys/dev/cxgbe/t4_ioctl.h projects/geom-events/sys/dev/cxgbe/t4_l2t.c projects/geom-events/sys/dev/cxgbe/t4_l2t.h projects/geom-events/sys/dev/cxgbe/t4_main.c projects/geom-events/sys/dev/cxgbe/t4_sge.c projects/geom-events/sys/dev/dcons/dcons_os.c projects/geom-events/sys/dev/de/if_de.c projects/geom-events/sys/dev/drm/i915_drv.h projects/geom-events/sys/dev/drm/mga_drv.h projects/geom-events/sys/dev/e1000/e1000_80003es2lan.c projects/geom-events/sys/dev/e1000/e1000_80003es2lan.h projects/geom-events/sys/dev/e1000/e1000_82540.c projects/geom-events/sys/dev/e1000/e1000_82541.c projects/geom-events/sys/dev/e1000/e1000_82543.c projects/geom-events/sys/dev/e1000/e1000_82571.c projects/geom-events/sys/dev/e1000/e1000_82575.c projects/geom-events/sys/dev/e1000/e1000_82575.h projects/geom-events/sys/dev/e1000/e1000_api.c projects/geom-events/sys/dev/e1000/e1000_api.h projects/geom-events/sys/dev/e1000/e1000_defines.h projects/geom-events/sys/dev/e1000/e1000_hw.h projects/geom-events/sys/dev/e1000/e1000_ich8lan.c projects/geom-events/sys/dev/e1000/e1000_ich8lan.h projects/geom-events/sys/dev/e1000/e1000_mac.c projects/geom-events/sys/dev/e1000/e1000_nvm.c projects/geom-events/sys/dev/e1000/e1000_nvm.h projects/geom-events/sys/dev/e1000/e1000_osdep.h projects/geom-events/sys/dev/e1000/e1000_phy.c projects/geom-events/sys/dev/e1000/e1000_phy.h projects/geom-events/sys/dev/e1000/e1000_regs.h projects/geom-events/sys/dev/e1000/e1000_vf.c projects/geom-events/sys/dev/e1000/if_em.c projects/geom-events/sys/dev/e1000/if_em.h projects/geom-events/sys/dev/e1000/if_igb.c projects/geom-events/sys/dev/e1000/if_igb.h projects/geom-events/sys/dev/e1000/if_lem.c projects/geom-events/sys/dev/e1000/if_lem.h projects/geom-events/sys/dev/ed/if_ed.c projects/geom-events/sys/dev/esp/ncr53c9x.c projects/geom-events/sys/dev/et/if_et.c projects/geom-events/sys/dev/et/if_etreg.h projects/geom-events/sys/dev/et/if_etvar.h projects/geom-events/sys/dev/fdc/fdc.c projects/geom-events/sys/dev/hwpmc/hwpmc_core.c projects/geom-events/sys/dev/if_ndis/if_ndis.c projects/geom-events/sys/dev/ipw/if_ipw.c projects/geom-events/sys/dev/isp/isp_freebsd.c projects/geom-events/sys/dev/iwi/if_iwi.c projects/geom-events/sys/dev/iwn/if_iwn.c projects/geom-events/sys/dev/ixgbe/ixgbe.c projects/geom-events/sys/dev/ixgbe/ixgbe_osdep.h projects/geom-events/sys/dev/ixgbe/ixv.c projects/geom-events/sys/dev/malo/if_malo.c projects/geom-events/sys/dev/md/md.c projects/geom-events/sys/dev/mii/mii.c projects/geom-events/sys/dev/mwl/if_mwl.c projects/geom-events/sys/dev/ofw/ofw_console.c projects/geom-events/sys/dev/pccard/pccardvar.h projects/geom-events/sys/dev/pci/isa_pci.c projects/geom-events/sys/dev/ral/rt2560.c projects/geom-events/sys/dev/ral/rt2661.c projects/geom-events/sys/dev/sio/sio.c projects/geom-events/sys/dev/sound/usb/uaudio.c projects/geom-events/sys/dev/sound/usb/uaudio.h projects/geom-events/sys/dev/speaker/spkr.c projects/geom-events/sys/dev/spibus/spibusvar.h projects/geom-events/sys/dev/syscons/syscons.c projects/geom-events/sys/dev/syscons/syscons.h projects/geom-events/sys/dev/ti/if_ti.c projects/geom-events/sys/dev/twa/tw_osl.h projects/geom-events/sys/dev/tws/tws.h projects/geom-events/sys/dev/uart/uart_subr.c projects/geom-events/sys/dev/uart/uart_tty.c projects/geom-events/sys/dev/usb/controller/at91dci.c projects/geom-events/sys/dev/usb/controller/at91dci.h projects/geom-events/sys/dev/usb/controller/at91dci_atmelarm.c projects/geom-events/sys/dev/usb/controller/atmegadci.c projects/geom-events/sys/dev/usb/controller/atmegadci.h projects/geom-events/sys/dev/usb/controller/atmegadci_atmelarm.c projects/geom-events/sys/dev/usb/controller/avr32dci.c projects/geom-events/sys/dev/usb/controller/avr32dci.h projects/geom-events/sys/dev/usb/controller/ehci.c projects/geom-events/sys/dev/usb/controller/ehci.h projects/geom-events/sys/dev/usb/controller/ehci_ixp4xx.c projects/geom-events/sys/dev/usb/controller/ehci_mv.c projects/geom-events/sys/dev/usb/controller/ehci_pci.c projects/geom-events/sys/dev/usb/controller/musb_otg.c projects/geom-events/sys/dev/usb/controller/musb_otg.h projects/geom-events/sys/dev/usb/controller/musb_otg_atmelarm.c projects/geom-events/sys/dev/usb/controller/ohci.c projects/geom-events/sys/dev/usb/controller/ohci.h projects/geom-events/sys/dev/usb/controller/ohci_atmelarm.c projects/geom-events/sys/dev/usb/controller/ohci_pci.c projects/geom-events/sys/dev/usb/controller/ohci_s3c24x0.c projects/geom-events/sys/dev/usb/controller/uhci.c projects/geom-events/sys/dev/usb/controller/uhci.h projects/geom-events/sys/dev/usb/controller/uhci_pci.c projects/geom-events/sys/dev/usb/controller/usb_controller.c projects/geom-events/sys/dev/usb/controller/uss820dci.c projects/geom-events/sys/dev/usb/controller/uss820dci.h projects/geom-events/sys/dev/usb/controller/uss820dci_atmelarm.c projects/geom-events/sys/dev/usb/controller/xhci_pci.c projects/geom-events/sys/dev/usb/controller/xhcireg.h projects/geom-events/sys/dev/usb/net/if_axe.c projects/geom-events/sys/dev/usb/serial/usb_serial.c projects/geom-events/sys/dev/usb/template/usb_template.c projects/geom-events/sys/dev/usb/template/usb_template_kbd.c projects/geom-events/sys/dev/usb/template/usb_template_modem.c projects/geom-events/sys/dev/usb/template/usb_template_mouse.c projects/geom-events/sys/dev/usb/usb_bus.h projects/geom-events/sys/dev/usb/usb_controller.h projects/geom-events/sys/dev/usb/usb_if.m projects/geom-events/sys/dev/usb/usbdevs projects/geom-events/sys/dev/usb/wlan/if_rum.c projects/geom-events/sys/dev/usb/wlan/if_run.c projects/geom-events/sys/dev/usb/wlan/if_uath.c projects/geom-events/sys/dev/usb/wlan/if_upgt.c projects/geom-events/sys/dev/usb/wlan/if_ural.c projects/geom-events/sys/dev/usb/wlan/if_urtw.c projects/geom-events/sys/dev/usb/wlan/if_zyd.c projects/geom-events/sys/dev/virtio/balloon/virtio_balloon.c projects/geom-events/sys/dev/virtio/balloon/virtio_balloon.h projects/geom-events/sys/dev/virtio/block/virtio_blk.c projects/geom-events/sys/dev/virtio/block/virtio_blk.h projects/geom-events/sys/dev/virtio/network/if_vtnet.c projects/geom-events/sys/dev/virtio/network/if_vtnetvar.h projects/geom-events/sys/dev/virtio/network/virtio_net.h projects/geom-events/sys/dev/virtio/pci/virtio_pci.h projects/geom-events/sys/dev/virtio/virtio.h projects/geom-events/sys/dev/virtio/virtio_ring.h projects/geom-events/sys/dev/vxge/vxge-osdep.h projects/geom-events/sys/dev/wi/if_wi.c projects/geom-events/sys/dev/wpi/if_wpi.c projects/geom-events/sys/dev/xen/console/console.c projects/geom-events/sys/dev/xen/netback/netback.c projects/geom-events/sys/fs/devfs/devfs_vnops.c projects/geom-events/sys/fs/ext2fs/ext2_alloc.c projects/geom-events/sys/fs/ext2fs/ext2_balloc.c projects/geom-events/sys/fs/ext2fs/ext2_bmap.c projects/geom-events/sys/fs/ext2fs/ext2_extern.h projects/geom-events/sys/fs/ext2fs/ext2_inode.c projects/geom-events/sys/fs/ext2fs/ext2_lookup.c projects/geom-events/sys/fs/ext2fs/ext2_subr.c projects/geom-events/sys/fs/ext2fs/ext2_vfsops.c projects/geom-events/sys/fs/ext2fs/ext2_vnops.c projects/geom-events/sys/fs/ext2fs/ext2fs.h projects/geom-events/sys/fs/ext2fs/fs.h projects/geom-events/sys/fs/nfsserver/nfs_nfsdport.c projects/geom-events/sys/gdb/gdb_cons.c projects/geom-events/sys/geom/eli/g_eli.c projects/geom-events/sys/i386/conf/NOTES projects/geom-events/sys/i386/i386/locore.s projects/geom-events/sys/i386/i386/mp_machdep.c projects/geom-events/sys/i386/i386/pmap.c projects/geom-events/sys/i386/include/_types.h projects/geom-events/sys/i386/include/vmparam.h projects/geom-events/sys/i386/xen/mp_machdep.c projects/geom-events/sys/ia64/ia64/ssc.c projects/geom-events/sys/ia64/ia64/uma_machdep.c projects/geom-events/sys/ia64/include/_types.h projects/geom-events/sys/kern/kern_cons.c projects/geom-events/sys/kern/kern_ktrace.c projects/geom-events/sys/kern/kern_lock.c projects/geom-events/sys/kern/kern_malloc.c projects/geom-events/sys/kern/kern_mutex.c projects/geom-events/sys/kern/kern_ntptime.c projects/geom-events/sys/kern/kern_proc.c projects/geom-events/sys/kern/kern_racct.c projects/geom-events/sys/kern/kern_resource.c projects/geom-events/sys/kern/kern_rmlock.c projects/geom-events/sys/kern/kern_rwlock.c projects/geom-events/sys/kern/kern_shutdown.c projects/geom-events/sys/kern/kern_sx.c projects/geom-events/sys/kern/kern_synch.c projects/geom-events/sys/kern/kern_thr.c projects/geom-events/sys/kern/subr_kdb.c projects/geom-events/sys/kern/subr_lock.c projects/geom-events/sys/kern/subr_witness.c projects/geom-events/sys/kern/sys_pipe.c projects/geom-events/sys/kern/uipc_shm.c projects/geom-events/sys/kern/uipc_sockbuf.c projects/geom-events/sys/kern/vfs_cache.c projects/geom-events/sys/kern/vfs_mountroot.c projects/geom-events/sys/kern/vfs_syscalls.c projects/geom-events/sys/mips/adm5120/console.c projects/geom-events/sys/mips/atheros/ar71xx_chip.c projects/geom-events/sys/mips/atheros/ar71xx_ehci.c projects/geom-events/sys/mips/atheros/ar71xx_gpio.c projects/geom-events/sys/mips/atheros/ar71xx_ohci.c projects/geom-events/sys/mips/atheros/ar724x_chip.c projects/geom-events/sys/mips/atheros/ar91xx_chip.c projects/geom-events/sys/mips/cavium/usb/octusb.c projects/geom-events/sys/mips/cavium/usb/octusb.h projects/geom-events/sys/mips/cavium/usb/octusb_octeon.c projects/geom-events/sys/mips/conf/AR91XX_BASE projects/geom-events/sys/mips/conf/AR91XX_BASE.hints projects/geom-events/sys/mips/conf/TP-WN1043ND.hints projects/geom-events/sys/mips/include/_types.h projects/geom-events/sys/mips/rmi/xls_ehci.c projects/geom-events/sys/mips/rt305x/rt305x_dotg.c projects/geom-events/sys/modules/Makefile projects/geom-events/sys/modules/cxgbe/Makefile projects/geom-events/sys/modules/splash/Makefile projects/geom-events/sys/modules/usb/Makefile projects/geom-events/sys/net/if.c projects/geom-events/sys/net/if.h projects/geom-events/sys/net/if_ethersubr.c projects/geom-events/sys/net/if_types.h projects/geom-events/sys/net/if_var.h projects/geom-events/sys/net/route.c projects/geom-events/sys/net/rtsock.c projects/geom-events/sys/net80211/ieee80211.c projects/geom-events/sys/net80211/ieee80211_acl.c projects/geom-events/sys/net80211/ieee80211_hostap.c projects/geom-events/sys/net80211/ieee80211_ht.c projects/geom-events/sys/net80211/ieee80211_ioctl.c projects/geom-events/sys/net80211/ieee80211_mesh.c projects/geom-events/sys/net80211/ieee80211_proto.h projects/geom-events/sys/net80211/ieee80211_var.h projects/geom-events/sys/netinet/if_ether.c projects/geom-events/sys/netinet/if_ether.h projects/geom-events/sys/netinet/in.c projects/geom-events/sys/netinet/in_var.h projects/geom-events/sys/netinet/ip_carp.c projects/geom-events/sys/netinet/ip_carp.h projects/geom-events/sys/netinet/sctp.h projects/geom-events/sys/netinet/sctp_asconf.c projects/geom-events/sys/netinet/sctp_asconf.h projects/geom-events/sys/netinet/sctp_auth.c projects/geom-events/sys/netinet/sctp_auth.h projects/geom-events/sys/netinet/sctp_bsd_addr.c projects/geom-events/sys/netinet/sctp_bsd_addr.h projects/geom-events/sys/netinet/sctp_cc_functions.c projects/geom-events/sys/netinet/sctp_constants.h projects/geom-events/sys/netinet/sctp_crc32.h projects/geom-events/sys/netinet/sctp_dtrace_declare.h projects/geom-events/sys/netinet/sctp_dtrace_define.h projects/geom-events/sys/netinet/sctp_header.h projects/geom-events/sys/netinet/sctp_indata.c projects/geom-events/sys/netinet/sctp_indata.h projects/geom-events/sys/netinet/sctp_input.c projects/geom-events/sys/netinet/sctp_input.h projects/geom-events/sys/netinet/sctp_os.h projects/geom-events/sys/netinet/sctp_output.c projects/geom-events/sys/netinet/sctp_output.h projects/geom-events/sys/netinet/sctp_pcb.c projects/geom-events/sys/netinet/sctp_pcb.h projects/geom-events/sys/netinet/sctp_peeloff.c projects/geom-events/sys/netinet/sctp_peeloff.h projects/geom-events/sys/netinet/sctp_ss_functions.c projects/geom-events/sys/netinet/sctp_structs.h projects/geom-events/sys/netinet/sctp_sysctl.c projects/geom-events/sys/netinet/sctp_sysctl.h projects/geom-events/sys/netinet/sctp_timer.c projects/geom-events/sys/netinet/sctp_timer.h projects/geom-events/sys/netinet/sctp_uio.h projects/geom-events/sys/netinet/sctp_usrreq.c projects/geom-events/sys/netinet/sctp_var.h projects/geom-events/sys/netinet/sctputil.c projects/geom-events/sys/netinet/sctputil.h projects/geom-events/sys/netinet6/in6.c projects/geom-events/sys/netinet6/in6_ifattach.c projects/geom-events/sys/netinet6/in6_var.h projects/geom-events/sys/netinet6/mld6.c projects/geom-events/sys/netinet6/nd6.c projects/geom-events/sys/netinet6/nd6_nbr.c projects/geom-events/sys/netinet6/sctp6_usrreq.c projects/geom-events/sys/netinet6/sctp6_var.h projects/geom-events/sys/nfs/bootp_subr.c projects/geom-events/sys/nfsserver/nfs_serv.c projects/geom-events/sys/ofed/include/asm/types.h projects/geom-events/sys/ofed/include/linux/types.h projects/geom-events/sys/pc98/cbus/scterm-sck.c projects/geom-events/sys/pc98/cbus/scvtb.c projects/geom-events/sys/pc98/cbus/sio.c projects/geom-events/sys/powerpc/aim/locore32.S projects/geom-events/sys/powerpc/aim/mmu_oea.c projects/geom-events/sys/powerpc/aim/mmu_oea64.c projects/geom-events/sys/powerpc/aim/uma_machdep.c projects/geom-events/sys/powerpc/include/_types.h projects/geom-events/sys/powerpc/include/pmap.h projects/geom-events/sys/powerpc/include/vmparam.h projects/geom-events/sys/powerpc/mambo/mambo_console.c projects/geom-events/sys/powerpc/ps3/ehci_ps3.c projects/geom-events/sys/powerpc/ps3/ohci_ps3.c projects/geom-events/sys/security/mac/mac_framework.c projects/geom-events/sys/sparc64/include/_types.h projects/geom-events/sys/sparc64/sparc64/vm_machdep.c projects/geom-events/sys/sys/cdefs.h projects/geom-events/sys/sys/cons.h projects/geom-events/sys/sys/elf_common.h projects/geom-events/sys/sys/libkern.h projects/geom-events/sys/sys/mman.h projects/geom-events/sys/sys/mutex.h projects/geom-events/sys/sys/param.h projects/geom-events/sys/sys/proc.h projects/geom-events/sys/sys/stdint.h projects/geom-events/sys/sys/systm.h projects/geom-events/sys/sys/types.h projects/geom-events/sys/vm/swap_pager.c projects/geom-events/sys/vm/vm_glue.c projects/geom-events/sys/vm/vm_meter.c projects/geom-events/sys/vm/vm_page.c projects/geom-events/sys/vm/vm_reserv.c projects/geom-events/sys/vm/vm_reserv.h projects/geom-events/sys/xen/xenstore/xenstore.c projects/geom-events/tools/build/mk/OptionalObsoleteFiles.inc projects/geom-events/tools/regression/sockets/unix_passfd/unix_passfd.c projects/geom-events/tools/tools/cxgbetool/cxgbetool.c projects/geom-events/usr.bin/csup/auth.c projects/geom-events/usr.bin/csup/proto.c projects/geom-events/usr.bin/du/du.1 projects/geom-events/usr.bin/du/du.c projects/geom-events/usr.bin/find/main.c projects/geom-events/usr.bin/gprof/aout.c projects/geom-events/usr.bin/gprof/arcs.c projects/geom-events/usr.bin/grep/grep.c projects/geom-events/usr.bin/grep/grep.h projects/geom-events/usr.bin/grep/util.c projects/geom-events/usr.bin/hexdump/conv.c projects/geom-events/usr.bin/indent/io.c projects/geom-events/usr.bin/lex/main.c projects/geom-events/usr.bin/mail/cmd1.c projects/geom-events/usr.bin/mail/extern.h projects/geom-events/usr.bin/mail/lex.c projects/geom-events/usr.bin/mail/main.c projects/geom-events/usr.bin/mt/mt.c projects/geom-events/usr.bin/ncplist/Makefile projects/geom-events/usr.bin/netstat/Makefile projects/geom-events/usr.bin/procstat/procstat_auxv.c projects/geom-events/usr.bin/procstat/procstat_rlimit.c projects/geom-events/usr.bin/tar/tree.c projects/geom-events/usr.bin/truss/amd64-linux32.c projects/geom-events/usr.bin/truss/i386-linux.c projects/geom-events/usr.bin/truss/main.c projects/geom-events/usr.bin/truss/syscalls.c projects/geom-events/usr.bin/vacation/Makefile projects/geom-events/usr.bin/vmstat/vmstat.c projects/geom-events/usr.sbin/bluetooth/sdpd/server.c projects/geom-events/usr.sbin/boot0cfg/Makefile projects/geom-events/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h projects/geom-events/usr.sbin/cpucontrol/Makefile projects/geom-events/usr.sbin/cpucontrol/cpucontrol.c projects/geom-events/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c projects/geom-events/usr.sbin/i2c/i2c.c projects/geom-events/usr.sbin/iostat/iostat.c projects/geom-events/usr.sbin/kbdcontrol/kbdcontrol.c projects/geom-events/usr.sbin/keyserv/crypt_server.c projects/geom-events/usr.sbin/keyserv/keyserv.c projects/geom-events/usr.sbin/lpr/filters/lpf.c projects/geom-events/usr.sbin/lpr/lpd/printjob.c projects/geom-events/usr.sbin/mount_portalfs/mount_portalfs.c projects/geom-events/usr.sbin/ndiscvt/Makefile projects/geom-events/usr.sbin/ndiscvt/inf-token.l projects/geom-events/usr.sbin/pkg_install/updating/main.c projects/geom-events/usr.sbin/pmccontrol/pmccontrol.c projects/geom-events/usr.sbin/powerd/powerd.c projects/geom-events/usr.sbin/pw/pw_user.c projects/geom-events/usr.sbin/route6d/route6d.c projects/geom-events/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/geom-events/ (props changed) projects/geom-events/cddl/contrib/opensolaris/ (props changed) projects/geom-events/contrib/bzip2/ (props changed) projects/geom-events/contrib/ee/ (props changed) projects/geom-events/contrib/file/ (props changed) projects/geom-events/contrib/groff/ (props changed) projects/geom-events/contrib/less/ (props changed) projects/geom-events/contrib/libstdc++/ (props changed) projects/geom-events/contrib/llvm/ (props changed) projects/geom-events/contrib/llvm/tools/clang/ (props changed) projects/geom-events/contrib/openpam/ (props changed) projects/geom-events/contrib/tzcode/zic/ (props changed) projects/geom-events/gnu/usr.bin/binutils/ (props changed) projects/geom-events/lib/libc/ (props changed) projects/geom-events/lib/libutil/ (props changed) projects/geom-events/sbin/ (props changed) projects/geom-events/sys/ (props changed) projects/geom-events/sys/boot/ (props changed) projects/geom-events/sys/cddl/contrib/opensolaris/ (props changed) projects/geom-events/sys/conf/ (props changed) projects/geom-events/usr.bin/csup/ (props changed) projects/geom-events/usr.bin/procstat/ (props changed) projects/geom-events/usr.sbin/ndiscvt/ (props changed) Modified: projects/geom-events/ObsoleteFiles.inc ============================================================================== --- projects/geom-events/ObsoleteFiles.inc Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/ObsoleteFiles.inc Sun Dec 18 00:31:06 2011 (r228676) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20111216: carp(4) module renamed +OLD_FILES+=boot/kernel/if_carp.ko +# 20111214: eventtimers(7) moved to eventtimers(4) +OLD_FILES+=usr/share/man/man7/eventtimers.7.gz # 20111125: amd(4) removed OLD_FILES+=usr/share/man/man4/amd.4.gz # 20111125: libodialog removed Modified: projects/geom-events/UPDATING ============================================================================== --- projects/geom-events/UPDATING Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/UPDATING Sun Dec 18 00:31:06 2011 (r228676) @@ -22,6 +22,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20111215: + The carp(4) facility has been changed significantly. Configuration + of the CARP protocol via ifconfig(8) has changed, as well as format + of CARP events submitted to devd(8) has changed. See manual pages + for more information. The arpbalance feature of carp(4) is currently + not supported anymore. + + Size of struct in_aliasreq, struct in6_aliasreq has changed. User + utilities using SIOCAIFADDR, SIOCAIFADDR_IN6, e.g. ifconfig(8), + need to be recompiled. + 20111122: The acpi_wmi(4) status device /dev/wmistat has been renamed to /dev/wmistat0. Modified: projects/geom-events/bin/chio/chio.c ============================================================================== --- projects/geom-events/bin/chio/chio.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/bin/chio/chio.c Sun Dec 18 00:31:06 2011 (r228676) @@ -87,7 +87,7 @@ static int do_voltag(const char *, int, #endif /* Valid changer element types. */ -const struct element_type elements[] = { +static const struct element_type elements[] = { { "drive", CHET_DT }, { "picker", CHET_MT }, { "portal", CHET_IE }, @@ -97,7 +97,7 @@ const struct element_type elements[] = { }; /* Valid commands. */ -const struct changer_command commands[] = { +static const struct changer_command commands[] = { { "exchange", do_exchange }, { "getpicker", do_getpicker }, { "ielem", do_ielem }, @@ -112,7 +112,7 @@ const struct changer_command commands[] }; /* Valid special words. */ -const struct special_word specials[] = { +static const struct special_word specials[] = { { "inv", SW_INVERT }, { "inv1", SW_INVERT1 }, { "inv2", SW_INVERT2 }, Modified: projects/geom-events/bin/ed/io.c ============================================================================== --- projects/geom-events/bin/ed/io.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/bin/ed/io.c Sun Dec 18 00:31:06 2011 (r228676) @@ -53,7 +53,8 @@ read_file(char *fn, long n) errmsg = "cannot close input file"; return ERR; } - fprintf(stdout, !scripted ? "%lu\n" : "", size); + if (!scripted) + fprintf(stdout, "%lu\n", size); return current_addr - n; } @@ -161,7 +162,8 @@ write_file(char *fn, const char *mode, l errmsg = "cannot close output file"; return ERR; } - fprintf(stdout, !scripted ? "%lu\n" : "", size); + if (!scripted) + fprintf(stdout, "%lu\n", size); return n ? m - n + 1 : 0; } Modified: projects/geom-events/bin/ed/main.c ============================================================================== --- projects/geom-events/bin/ed/main.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/bin/ed/main.c Sun Dec 18 00:31:06 2011 (r228676) @@ -192,9 +192,10 @@ top: fputs("?\n", stderr); errmsg = "warning: file modified"; if (!isatty(0)) { - fprintf(stderr, garrulous ? - "script, line %d: %s\n" : - "", lineno, errmsg); + if (garrulous) + fprintf(stderr, + "script, line %d: %s\n", + lineno, errmsg); quit(2); } clearerr(stdin); @@ -225,27 +226,26 @@ top: fputs("?\n", stderr); /* give warning */ errmsg = "warning: file modified"; if (!isatty(0)) { - fprintf(stderr, garrulous ? - "script, line %d: %s\n" : - "", lineno, errmsg); + if (garrulous) + fprintf(stderr, "script, line %d: %s\n", + lineno, errmsg); quit(2); } break; case FATAL: - if (!isatty(0)) - fprintf(stderr, garrulous ? - "script, line %d: %s\n" : "", - lineno, errmsg); - else - fprintf(stderr, garrulous ? "%s\n" : "", - errmsg); + if (!isatty(0)) { + if (garrulous) + fprintf(stderr, "script, line %d: %s\n", + lineno, errmsg); + } else if (garrulous) + fprintf(stderr, "%s\n", errmsg); quit(3); default: fputs("?\n", stderr); if (!isatty(0)) { - fprintf(stderr, garrulous ? - "script, line %d: %s\n" : "", - lineno, errmsg); + if (garrulous) + fprintf(stderr, "script, line %d: %s\n", + lineno, errmsg); quit(2); } break; Modified: projects/geom-events/bin/stty/modes.c ============================================================================== --- projects/geom-events/bin/stty/modes.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/bin/stty/modes.c Sun Dec 18 00:31:06 2011 (r228676) @@ -52,7 +52,7 @@ struct modes { * The code in optlist() depends on minus options following regular * options, i.e. "foo" must immediately precede "-foo". */ -struct modes cmodes[] = { +static const struct modes cmodes[] = { { "cs5", CS5, CSIZE }, { "cs6", CS6, CSIZE }, { "cs7", CS7, CSIZE }, @@ -94,7 +94,7 @@ struct modes cmodes[] = { { NULL, 0, 0 }, }; -struct modes imodes[] = { +static const struct modes imodes[] = { { "ignbrk", IGNBRK, 0 }, { "-ignbrk", 0, IGNBRK }, { "brkint", BRKINT, 0 }, @@ -130,7 +130,7 @@ struct modes imodes[] = { { NULL, 0, 0 }, }; -struct modes lmodes[] = { +static const struct modes lmodes[] = { { "echo", ECHO, 0 }, { "-echo", 0, ECHO }, { "echoe", ECHOE, 0 }, @@ -182,7 +182,7 @@ struct modes lmodes[] = { { NULL, 0, 0 }, }; -struct modes omodes[] = { +static const struct modes omodes[] = { { "opost", OPOST, 0 }, { "-opost", 0, OPOST }, { "litout", 0, OPOST }, @@ -209,7 +209,7 @@ struct modes omodes[] = { int msearch(char ***argvp, struct info *ip) { - struct modes *mp; + const struct modes *mp; char *name; name = **argvp; Modified: projects/geom-events/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sun Dec 18 00:31:06 2011 (r228676) @@ -671,9 +671,12 @@ link_prog(dtrace_cmd_t *dcp) p[0] = '\0'; /* strip .d suffix */ (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), "%s.o", basename(dcp->dc_arg)); + } else if (g_cmdc > 1) { + (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), + "d.out.%td", dcp - g_cmdv); } else { (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), - g_cmdc > 1 ? "%s.%d" : "%s", "d.out", (int)(dcp - g_cmdv)); + "d.out"); } if (dtrace_program_link(g_dtp, dcp->dc_prog, DTRACE_D_PROBES, Modified: projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sun Dec 18 00:31:06 2011 (r228676) @@ -377,7 +377,7 @@ property. This directory is created as n automatically mounts the file system when the .Qq Nm Cm mount Fl a command is invoked (without editing -.Pa /etc/fstab Ns ). +.Pa /etc/fstab ) . The .Sy mountpoint property can be inherited, so if @@ -409,7 +409,7 @@ responsible for mounting and unmounting dataset can be attached to a jail by using the .Qq Nm Cm jail subcommand. You cannot attach a dataset to one jail and the children of the -same dataset to another jails. To allow managment of the dataset from within +same dataset to another jails. To allow management of the dataset from within a jail, the .Sy jailed property has to be set. The @@ -624,10 +624,10 @@ symbol, using one of the following forms .Bl -bullet -offset 2n .It POSIX name (for example, -.Em joe Ns ) +.Em joe ) .It POSIX numeric ID (for example, -.Em 1001 Ns ) +.Em 1001 ) .El .It Sy userrefs This property is set to the number of user holds on this snapshot. User holds @@ -673,7 +673,7 @@ snapshot. The .Ar snapshot may be specified as a short snapshot name (just the part after the -.Sy @ Ns ), +.Sy @ ) , in which case it will be interpreted as a snapshot in the same filesystem as this dataset. The .Ar snapshot @@ -847,7 +847,7 @@ is an integer from 1 (fastest) to 9 (bes is equivalent to .Cm gzip-6 (which is also the default for -.Xr gzip 1 Ns ). +.Xr gzip 1 ) . The .Cm zle compression algorithm compresses runs of zeros. @@ -952,7 +952,7 @@ space calculation does not include space such as snapshots and clones. User space consumption is identified by the .Sy userspace@ Ns Ar user property. -.sp +.Pp Enforcement of user quotas may be delayed by several seconds. This delay means that a user might exceed their quota before the system notices that they are over quota and begins to refuse additional writes with the @@ -960,14 +960,14 @@ over quota and begins to refuse addition error message. See the .Cm userspace subcommand for more information. -.sp +.Pp Unprivileged users can only access their own groups' space usage. The root user, or a user who has been granted the .Sy userquota privilege with .Qq Nm Cm allow , can get and set everyone's quota. -.sp +.Pp This property is not available on volumes, on file systems before version 4, or on pools before version 15. The .Sy userquota@ Ns ... @@ -979,17 +979,17 @@ symbol, using one of the following forms .Bl -bullet -offset 2n .It POSIX name (for example, -.Em joe Ns ) +.Em joe ) .It POSIX numeric ID (for example, -.Em 1001 Ns ) +.Em 1001 ) .El .It Sy groupquota@ Ns Ar group Ns = Ns Ar size | Cm none Limits the amount of space consumed by the specified group. Group space consumption is identified by the .Sy userquota@ Ns Ar user property. -.sp +.Pp Unprivileged users can access only their own groups' space usage. The root user, or a user who has been granted the .Sy groupquota @@ -1020,7 +1020,7 @@ than or equal to 128 Kbytes. Changing the file system's .Sy recordsize affects only files created afterward; existing files are unaffected. -.sp +.Pp This property can also be referred to by its shortened column name, .Sy recsize . .It Sy refquota Ns = Ns Ar size | Cm none @@ -1036,13 +1036,13 @@ The .Sy refreservation reservation is accounted for in the parent datasets' space used, and counts against the parent datasets' quotas and reservations. -.sp +.Pp If .Sy refreservation is set, a snapshot is only allowed if there is enough free pool space outside of this reservation to accommodate the current number of "referenced" bytes in the dataset. -.sp +.Pp This property can also be referred to by its shortened column name, .Sy refreserv . .It Sy reservation Ns = Ns Ar size | Cm none @@ -1161,7 +1161,7 @@ version number of 9 or higher, a is set instead. Any changes to .Sy volsize are reflected in an equivalent change to the reservation (or -.Sy refreservation Ns ). +.Sy refreservation ) . The .Sy volsize can only be set to a multiple of @@ -1174,7 +1174,7 @@ run out of space, resulting in undefined on how the volume is used. These effects can also occur when the volume size is changed while it is in use (particularly when shrinking the size). Extreme care should be used when adjusting the volume size. -.sp +.Pp Though not recommended, a "sparse volume" (also known as "thin provisioning") can be created by specifying the .Fl s @@ -1708,7 +1708,7 @@ Snapshots are displayed if the property is .Cm on (the default is -.Cm off Ns ). +.Cm off ) . The following fields are displayed, .Sy name , used , available , referenced , mountpoint . .Bl -tag -width indent @@ -2168,10 +2168,10 @@ Creates a stream representation of the l argument (not part of .Fl i or -.Fl I Ns ) +.Fl I ) which is written to standard output. The output can be redirected to a file or to a different system (for example, using -.Xr ssh 1 Ns ). +.Xr ssh 1 ) . By default, a full stream is generated. .Bl -tag -width indent .It Fl i Ar snapshot @@ -2180,10 +2180,10 @@ Generate an incremental stream from the to the last .Ar snapshot . The incremental source (the -.Fl i Ar snapshot Ns ) +.Fl i Ar snapshot ) can be specified as the last component of the snapshot name (for example, the part after the -.Sy @ Ns ), +.Sy @ ) , and it is assumed to be from the same file system as the last .Ar snapshot . .Pp @@ -2191,11 +2191,13 @@ If the destination is a clone, the sourc must be fully specified (for example, .Cm pool/fs@origin , not just -.Cm @origin Ns ). +.Cm @origin ) . .It Fl I Ar snapshot Generate a stream package that sends all intermediary snapshots from the -.Fl I Ar snapshot to the last -.Ar snapshot . For example, +.Fl I Ar snapshot +to the last +.Ar snapshot . +For example, .Ic -I @a fs@d is similar to .Ic -i @a fs@b; -i @b fs@c; -i @c fs@d . @@ -2223,12 +2225,12 @@ flag is specified when this stream is re .It Fl D Generate a deduplicated stream. Blocks which would have been sent multiple times in the send stream will only be sent once. The receiving system must -also support this feature to recieve a deduplicated stream. This flag can +also support this feature to receive a deduplicated stream. This flag can be used regardless of the dataset's .Sy dedup property, but performance will be much better if the filesystem uses a dedup-capable checksum (eg. -.Sy sha256 Ns ). +.Sy sha256 ) . .It Fl r Recursively send all descendant snapshots. This is similar to the .Fl R @@ -2323,14 +2325,14 @@ option is specified, all but the pool na appended (for example, .Sy b/c@1 appended from sent snapshot -.Sy a/b/c@1 Ns ), +.Sy a/b/c@1 ) , and if the .Fl e option is specified, only the tail of the sent snapshot path is appended (for example, .Sy c@1 appended from sent snapshot -.Sy a/b/c@1 Ns ). +.Sy a/b/c@1 ) . In the case of .Fl d , any file systems needed to replicate the path of the sent snapshot are created @@ -2349,13 +2351,13 @@ Print verbose information about the stre receive operation. .It Fl n Do not actually receive the stream. This can be useful in conjunction with the -.It Fl v +.Fl v option to verify the name the receive operation would use. .It Fl F Force a rollback of the file system to the most recent snapshot before performing the receive operation. If receiving an incremental replication stream (for example, one generated by -.Qq Nm Cm send Fl R Fi iI Ns ) , +.Qq Nm Cm send Fl R Fi iI ) , destroy snapshots and file systems that do not exist on the sending side. .El .It Xo @@ -2409,7 +2411,8 @@ option. .Op Fl e .Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ... .Xc -Specifies that the permissions be delegated to "everyone." Multiple permissions +Specifies that the permissions be delegated to "everyone". +Multiple permissions may be specified as a comma-separated list. Permission names are the same as .Tn ZFS subcommand and property names. See the property list below. Property set names, @@ -2655,7 +2658,7 @@ Describes differences between a snapshot successor dataset can be a later snapshot or the current filesystem. .Pp The changed files are displayed including the change type. The change type -is displayed ussing a single character. If a file or directory was renamed, +is displayed useing a single character. If a file or directory was renamed, the old and the new names are displayed. .Pp The following change types can be displayed: @@ -2680,9 +2683,9 @@ The following file types can be displaye .It \&B Ta block device .It \&@ Ta symbolic link .It \&= Ta socket -.It \&> Ta door (not supported on Fx Ns ) -.It \&| Ta FIFO (not supported on Fx Ns ) -.It \&P Ta event portal (not supported on Fx Ns ) +.It \&> Ta door (not supported on Fx ) +.It \&| Ta FIFO (not supported on Fx ) +.It \&P Ta event portal (not supported on Fx ) .El .It Fl H Machine-parseable output, fields separated a tab character. Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sun Dec 18 00:31:06 2011 (r228676) @@ -102,7 +102,7 @@ fixsymbol(Elf *e, Elf_Data *data, size_t int ndx; while (gelf_getsym(data, j++, &sym) != NULL) { - prb = (dof_probe_t *)(buf + sec->dofs_offset); + prb = (dof_probe_t *)(void *)(buf + sec->dofs_offset); for (ndx = nprobes; ndx; ndx--, prb += 1) { funcname = dofstrtab + prb->dofpr_func; Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Sun Dec 18 00:31:06 2011 (r228676) @@ -873,7 +873,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE * if (pc > sym.st_value) { (void) snprintf(c, sizeof (c), "%s`%s+0x%llx", dts.dts_object, dts.dts_name, - pc - sym.st_value); + (u_longlong_t)(pc - sym.st_value)); } else { (void) snprintf(c, sizeof (c), "%s`%s", dts.dts_object, dts.dts_name); @@ -886,9 +886,10 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE * */ if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) { (void) snprintf(c, sizeof (c), "%s`0x%llx", - dts.dts_object, pc); + dts.dts_object, (u_longlong_t)pc); } else { - (void) snprintf(c, sizeof (c), "0x%llx", pc); + (void) snprintf(c, sizeof (c), "0x%llx", + (u_longlong_t)pc); } } Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c Sun Dec 18 00:31:06 2011 (r228676) @@ -335,7 +335,8 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, pro } (void) snprintf(s, size, "%llu %sdrop%s on CPU %d\n", - howmany, what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ", + (u_longlong_t)howmany, + what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ", howmany > 1 ? "s" : "", cpu); if (dtp->dt_drophdlr == NULL) @@ -427,7 +428,8 @@ dt_handle_status(dtrace_hdl_t *dtp, dtra size = sizeof (str); } - (void) snprintf(s, size, "%llu %s%s%s\n", nval - oval, + (void) snprintf(s, size, "%llu %s%s%s\n", + (u_longlong_t)(nval - oval), _dt_droptab[i].dtdrt_str, (nval - oval > 1) ? "s" : "", _dt_droptab[i].dtdrt_msg != NULL ? _dt_droptab[i].dtdrt_msg : ""); Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Dec 18 00:31:06 2011 (r228676) @@ -1106,7 +1106,7 @@ process_obj(dtrace_hdl_t *dtp, const cha static const char dt_prefix[] = "__dtrace"; static const char dt_enabled[] = "enabled"; static const char dt_symprefix[] = "$dtrace"; - static const char dt_symfmt[] = "%s%d.%s"; + static const char dt_symfmt[] = "%s%ld.%s"; int fd, i, ndx, eprobe, mod = 0; Elf *elf = NULL; GElf_Ehdr ehdr; Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sun Dec 18 00:31:06 2011 (r228676) @@ -27,6 +27,7 @@ #if defined(sun) #include <sys/sysmacros.h> #endif +#include <sys/isa_defs.h> #include <strings.h> #include <unistd.h> Modified: projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c Sun Dec 18 00:31:06 2011 (r228676) @@ -436,7 +436,7 @@ dt_pid_create_glob_offset_probes(struct char name[sizeof (i) * 2 + 1]; for (i = 0; i < end; i += size) { - (void) snprintf(name, sizeof (name), "%x", i); + (void) snprintf(name, sizeof (name), "%lx", i); if (gmatch(name, pattern)) ftp->ftps_offs[ftp->ftps_noffs++] = i; Modified: projects/geom-events/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c ============================================================================== --- projects/geom-events/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c Sun Dec 18 00:31:06 2011 (r228676) @@ -228,7 +228,7 @@ usage(void) "\n" " Note: if -L labelenv is specified and labelenv is not set in\n" " the environment, a default value is used.\n", - progname, progname, strlen(progname), " ", + progname, progname, (int)strlen(progname), " ", progname, progname); } Modified: projects/geom-events/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- projects/geom-events/contrib/bsnmp/snmp_mibII/mibII.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/bsnmp/snmp_mibII/mibII.c Sun Dec 18 00:31:06 2011 (r228676) @@ -941,7 +941,7 @@ handle_rtmsg(struct rt_msghdr *rtm) { struct sockaddr *addrs[RTAX_MAX]; struct if_msghdr *ifm; - struct ifa_msghdr *ifam; + struct ifa_msghdr ifam; struct ifma_msghdr *ifmam; #ifdef RTM_IFANNOUNCE struct if_announcemsghdr *ifan; @@ -961,17 +961,17 @@ handle_rtmsg(struct rt_msghdr *rtm) switch (rtm->rtm_type) { case RTM_NEWADDR: - ifam = (struct ifa_msghdr *)rtm; - mib_extract_addrs(ifam->ifam_addrs, (u_char *)(ifam + 1), addrs); + memcpy(&ifam, rtm, sizeof(ifam)); + mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs); if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL) break; sa = (struct sockaddr_in *)(void *)addrs[RTAX_IFA]; if ((ifa = mib_find_ifa(sa->sin_addr)) == NULL) { /* unknown address */ - if ((ifp = mib_find_if_sys(ifam->ifam_index)) == NULL) { + if ((ifp = mib_find_if_sys(ifam.ifam_index)) == NULL) { syslog(LOG_WARNING, "RTM_NEWADDR for unknown " - "interface %u", ifam->ifam_index); + "interface %u", ifam.ifam_index); break; } if ((ifa = alloc_ifa(ifp->index, sa->sin_addr)) == NULL) @@ -988,8 +988,8 @@ handle_rtmsg(struct rt_msghdr *rtm) break; case RTM_DELADDR: - ifam = (struct ifa_msghdr *)rtm; - mib_extract_addrs(ifam->ifam_addrs, (u_char *)(ifam + 1), addrs); + memcpy(&ifam, rtm, sizeof(ifam)); + mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs); if (addrs[RTAX_IFA] == NULL) break; Modified: projects/geom-events/contrib/bsnmp/snmpd/snmpmod.h ============================================================================== --- projects/geom-events/contrib/bsnmp/snmpd/snmpmod.h Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/bsnmp/snmpd/snmpmod.h Sun Dec 18 00:31:06 2011 (r228676) @@ -40,6 +40,7 @@ #define snmpmod_h_ #include <sys/types.h> +#include <sys/queue.h> #include <sys/socket.h> #include <net/if.h> #include <netinet/in.h> Modified: projects/geom-events/contrib/bzip2/bzip2recover.c ============================================================================== --- projects/geom-events/contrib/bzip2/bzip2recover.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/bzip2/bzip2recover.c Sun Dec 18 00:31:06 2011 (r228676) @@ -37,7 +37,7 @@ */ #ifdef __GNUC__ typedef unsigned long long int MaybeUInt64; -# define MaybeUInt64_FMT "%Lu" +# define MaybeUInt64_FMT "%llu" #else #ifdef _MSC_VER typedef unsigned __int64 MaybeUInt64; Modified: projects/geom-events/contrib/ee/ee.c ============================================================================== --- projects/geom-events/contrib/ee/ee.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/ee/ee.c Sun Dec 18 00:31:06 2011 (r228676) @@ -307,7 +307,7 @@ void undel_word P_((void)); void del_line P_((void)); void undel_line P_((void)); void adv_word P_((void)); -void move_rel P_((char direction, int lines)); +void move_rel P_((int direction, int lines)); void eol P_((void)); void bol P_((void)); void adv_line P_((void)); @@ -2105,10 +2105,10 @@ char *arguments[]; else if (!strcmp("-?", buff)) { fprintf(stderr, usage0, arguments[0]); - fprintf(stderr, usage1); - fprintf(stderr, usage2); - fprintf(stderr, usage3); - fprintf(stderr, usage4); + fputs(usage1, stderr); + fputs(usage2, stderr); + fputs(usage3, stderr); + fputs(usage4, stderr); exit(1); } else if ((*buff == '+') && (start_at_line == NULL)) @@ -2939,7 +2939,7 @@ while ((position < curr_line->line_lengt void move_rel(direction, lines) /* move relative to current line */ -char direction; +int direction; int lines; { int i; @@ -3242,7 +3242,7 @@ char *string; /* string containing user } if (shell_fork) { - printf(continue_msg); + fputs(continue_msg, stdout); fflush(stdout); while ((in = getchar()) != '\n') ; Modified: projects/geom-events/contrib/file/softmagic.c ============================================================================== --- projects/geom-events/contrib/file/softmagic.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/file/softmagic.c Sun Dec 18 00:31:06 2011 (r228676) @@ -1582,7 +1582,7 @@ mget(struct magic_set *ms, const unsigne case FILE_INDIRECT: if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 && - file_printf(ms, m->desc) == -1) + file_printf(ms, "%s", m->desc) == -1) return -1; if (nbytes < offset) return 0; Modified: projects/geom-events/contrib/gcclibs/libcpp/include/cpplib.h ============================================================================== --- projects/geom-events/contrib/gcclibs/libcpp/include/cpplib.h Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/gcclibs/libcpp/include/cpplib.h Sun Dec 18 00:31:06 2011 (r228676) @@ -555,7 +555,8 @@ enum builtin_type BT_TIME, /* `__TIME__' */ BT_STDC, /* `__STDC__' */ BT_PRAGMA, /* `_Pragma' operator */ - BT_TIMESTAMP /* `__TIMESTAMP__' */ + BT_TIMESTAMP, /* `__TIMESTAMP__' */ + BT_COUNTER /* `__COUNTER__' */ }; #define CPP_HASHNODE(HNODE) ((cpp_hashnode *) (HNODE)) Modified: projects/geom-events/contrib/gcclibs/libcpp/init.c ============================================================================== --- projects/geom-events/contrib/gcclibs/libcpp/init.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/gcclibs/libcpp/init.c Sun Dec 18 00:31:06 2011 (r228676) @@ -308,6 +308,7 @@ static const struct builtin builtin_arra B("__BASE_FILE__", BT_BASE_FILE), B("__LINE__", BT_SPECLINE), B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL), + B("__COUNTER__", BT_COUNTER), /* Keep builtins not used for -traditional-cpp at the end, and update init_builtins() if any more are added. */ B("_Pragma", BT_PRAGMA), Modified: projects/geom-events/contrib/gcclibs/libcpp/internal.h ============================================================================== --- projects/geom-events/contrib/gcclibs/libcpp/internal.h Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/gcclibs/libcpp/internal.h Sun Dec 18 00:31:06 2011 (r228676) @@ -448,6 +448,8 @@ struct cpp_reader /* A saved list of the defined macros, for dependency checking of precompiled headers. */ struct cpp_savedstate *savedstate; + + unsigned int nextcounter; }; /* Character classes. Based on the more primitive macros in safe-ctype.h. Modified: projects/geom-events/contrib/gcclibs/libcpp/macro.c ============================================================================== --- projects/geom-events/contrib/gcclibs/libcpp/macro.c Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/gcclibs/libcpp/macro.c Sun Dec 18 00:31:06 2011 (r228676) @@ -262,6 +262,10 @@ _cpp_builtin_macro_text (cpp_reader *pfi else result = pfile->time; break; + + case BT_COUNTER: + number = pfile->nextcounter++; + break; } if (result == NULL) Modified: projects/geom-events/contrib/gperf/src/output.cc ============================================================================== --- projects/geom-events/contrib/gperf/src/output.cc Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/gperf/src/output.cc Sun Dec 18 00:31:06 2011 (r228676) @@ -1300,7 +1300,7 @@ Output::output_lookup_array () const if (option[DEBUG]) fprintf (stderr, - "dup_ptr[%d]: hash_value = %d, index = %d, count = %d\n", + "dup_ptr[%td]: hash_value = %d, index = %d, count = %d\n", dup_ptr - duplicates, dup_ptr->hash_value, dup_ptr->index, dup_ptr->count); Modified: projects/geom-events/contrib/groff/tmac/doc-common ============================================================================== --- projects/geom-events/contrib/groff/tmac/doc-common Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/groff/tmac/doc-common Sun Dec 18 00:31:06 2011 (r228676) @@ -264,50 +264,72 @@ .ds doc-volume-as-algor algor .ds doc-volume-as-amd64 amd64 .ds doc-volume-as-amiga amiga +.ds doc-volume-as-amigappc amigappc .ds doc-volume-as-arc arc +.ds doc-volume-as-arm arm .ds doc-volume-as-arm26 arm26 .ds doc-volume-as-arm32 arm32 +.ds doc-volume-as-armish armish .ds doc-volume-as-atari atari +.ds doc-volume-as-aviion aviion +.ds doc-volume-as-beagle beagle .ds doc-volume-as-bebox bebox .ds doc-volume-as-cats cats .ds doc-volume-as-cesfic cesfic .ds doc-volume-as-cobalt cobalt .ds doc-volume-as-dreamcast dreamcast +.ds doc-volume-as-emips emips .ds doc-volume-as-evbarm evbarm .ds doc-volume-as-evbmips evbmips .ds doc-volume-as-evbppc evbppc .ds doc-volume-as-evbsh3 evbsh3 +.ds doc-volume-as-ews4800mips ews4800mips .ds doc-volume-as-hp300 hp300 .ds doc-volume-as-hp700 hp700 .ds doc-volume-as-hpcarm hpcarm .ds doc-volume-as-hpcmips hpcmips .ds doc-volume-as-hpcsh hpcsh +.ds doc-volume-as-hppa hppa +.ds doc-volume-as-hppa64 hppa64 .ds doc-volume-as-i386 i386 +.ds doc-volume-as-ia64 ia64 +.ds doc-volume-as-ibmnws ibmnws +.ds doc-volume-as-iyonix iyonix +.ds doc-volume-as-landisk landisk +.ds doc-volume-as-loongson loongson .ds doc-volume-as-luna68k luna68k +.ds doc-volume-as-luna88k luna88k .ds doc-volume-as-m68k m68k .ds doc-volume-as-mac68k mac68k .ds doc-volume-as-macppc macppc .ds doc-volume-as-mips mips +.ds doc-volume-as-mips64 mips64 .ds doc-volume-as-mipsco mipsco .ds doc-volume-as-mmeye mmeye .ds doc-volume-as-mvme68k mvme68k +.ds doc-volume-as-mvme88k mvme88k .ds doc-volume-as-mvmeppc mvmeppc .ds doc-volume-as-netwinder netwinder .ds doc-volume-as-news68k news68k .ds doc-volume-as-newsmips newsmips .ds doc-volume-as-next68k next68k .ds doc-volume-as-ofppc ofppc +.ds doc-volume-as-palm palm .ds doc-volume-as-pc532 pc532 .ds doc-volume-as-playstation2 playstation2 .ds doc-volume-as-pmax pmax .ds doc-volume-as-pmppc pmppc .ds doc-volume-as-powerpc powerpc .ds doc-volume-as-prep prep +.ds doc-volume-as-rs6000 rs6000 .ds doc-volume-as-sandpoint sandpoint .ds doc-volume-as-sbmips sbmips +.ds doc-volume-as-sgi sgi .ds doc-volume-as-sgimips sgimips .ds doc-volume-as-sh3 sh3 .ds doc-volume-as-shark shark +.ds doc-volume-as-socppc socppc +.ds doc-volume-as-solbourne solbourne .ds doc-volume-as-sparc sparc .ds doc-volume-as-sparc64 sparc64 .ds doc-volume-as-sun2 sun2 @@ -316,6 +338,8 @@ .ds doc-volume-as-vax vax .ds doc-volume-as-x68k x68k .ds doc-volume-as-x86_64 x86_64 +.ds doc-volume-as-xen xen +.ds doc-volume-as-zaurus zaurus . .de Dt . \" reset default arguments @@ -451,12 +475,16 @@ .ds doc-operating-system-NetBSD-3.0 3.0 .ds doc-operating-system-NetBSD-3.0.1 3.0.1 .ds doc-operating-system-NetBSD-3.0.2 3.0.2 +.ds doc-operating-system-NetBSD-3.0.3 3.0.3 .ds doc-operating-system-NetBSD-3.1 3.1 +.ds doc-operating-system-NetBSD-3.1.1 3.1.1 .ds doc-operating-system-NetBSD-4.0 4.0 .ds doc-operating-system-NetBSD-4.0.1 4.0.1 .ds doc-operating-system-NetBSD-5.0 5.0 .ds doc-operating-system-NetBSD-5.0.1 5.0.1 .ds doc-operating-system-NetBSD-5.0.2 5.0.2 +.ds doc-operating-system-NetBSD-5.1 5.1 +.ds doc-operating-system-NetBSD-6.0 6.0 . .ds doc-operating-system-OpenBSD-2.0 2.0 .ds doc-operating-system-OpenBSD-2.1 2.1 @@ -487,6 +515,8 @@ .ds doc-operating-system-OpenBSD-4.6 4.6 .ds doc-operating-system-OpenBSD-4.7 4.7 .ds doc-operating-system-OpenBSD-4.8 4.8 +.ds doc-operating-system-OpenBSD-4.9 4.9 +.ds doc-operating-system-OpenBSD-5.0 5.0 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -544,6 +574,7 @@ .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-8.1 8.1 .ds doc-operating-system-FreeBSD-8.2 8.2 +.ds doc-operating-system-FreeBSD-9.0 9.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 @@ -566,7 +597,6 @@ .ds doc-operating-system-Darwin-9.6.0 9.6.0 .ds doc-operating-system-Darwin-9.7.0 9.7.0 .ds doc-operating-system-Darwin-9.8.0 9.8.0 -.ds doc-operating-system-Darwin-10.6.0 10.6.0 .ds doc-operating-system-Darwin-10.1.0 10.1.0 .ds doc-operating-system-Darwin-10.2.0 10.2.0 .ds doc-operating-system-Darwin-10.3.0 10.3.0 @@ -593,6 +623,11 @@ .ds doc-operating-system-DragonFly-2.4 2.4 .ds doc-operating-system-DragonFly-2.6 2.6 .ds doc-operating-system-DragonFly-2.8 2.8 +.ds doc-operating-system-DragonFly-2.9 2.9 +.ds doc-operating-system-DragonFly-2.9.1 2.9.1 +.ds doc-operating-system-DragonFly-2.10 2.10 +.ds doc-operating-system-DragonFly-2.10.1 2.10.1 +.ds doc-operating-system-DragonFly-2.11 2.11 . .de Os . ds doc-command-name Modified: projects/geom-events/contrib/groff/tmac/doc-syms ============================================================================== --- projects/geom-events/contrib/groff/tmac/doc-syms Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/groff/tmac/doc-syms Sun Dec 18 00:31:06 2011 (r228676) @@ -754,38 +754,74 @@ .\" NS .\" NS width register `Lb' defined in doc-common . +.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) .ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm) .ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32) +.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) .ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm) .ds doc-str-Lb-libc Standard C\~Library (libc, \-lc) +.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) +.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) +.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) .ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk) +.ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) .ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat) .ds doc-str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt) .ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) +.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) +.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) +.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) +.ds doc-str-Lb-libdwarf DWARF Access Library (libdwarf, \-ldwarf) .ds doc-str-Lb-libedit Command Line Editor Library (libedit, \-ledit) +.ds doc-str-Lb-libelf ELF Access Library (libelf, \-lelf) .ds doc-str-Lb-libevent Event Notification Library (libevent, \-levent) +.ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) .ds doc-str-Lb-libform Curses Form Library (libform, \-lform) +.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) +.ds doc-str-Lb-libgpib General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib) .ds doc-str-Lb-libi386 i386 Architecture Library (libi386, \-li386) .ds doc-str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl) .ds doc-str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec) +.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) +.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) +.ds doc-str-Lb-libjail Jail Library (libjail, \-ljail) +.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) +.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) .ds doc-str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm) .ds doc-str-Lb-libm Math Library (libm, \-lm) .ds doc-str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k) .ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) +.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) +.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) .ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) +.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) +.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) .ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) .ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) .ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) .ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) .ds doc-str-Lb-libposix \*[Px] \*[doc-str-Lb]Compatibility Library (libposix, \-lposix) +.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) .ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread) +.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) +.ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) .ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) +.ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss) +.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) +.ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) +.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) .ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) +.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) +.ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) +.ds doc-str-Lb-libufs UFS File System Access Library (libufs, \-lufs) +.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) +.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) +.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) . Modified: projects/geom-events/contrib/groff/tmac/doc.tmac ============================================================================== --- projects/geom-events/contrib/groff/tmac/doc.tmac Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/groff/tmac/doc.tmac Sun Dec 18 00:31:06 2011 (r228676) @@ -4268,7 +4268,7 @@ . if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ . nr doc-reg-Xr (\n[doc-arg-ptr] + 1) . \" modify second argument if it is a string and -. \" remove space inbetween +. \" remove space in between . if (\n[doc-type\n[doc-reg-Xr]] == 2) \{\ . ds doc-arg\n[doc-reg-Xr] \*[lp]\*[doc-arg\n[doc-reg-Xr]]\*[rp] . ds doc-space\n[doc-arg-ptr] @@ -5091,7 +5091,7 @@ . . .\" NS doc-build-func-string macro -.\" NS collect function arguments and set hard spaces inbetween +.\" NS collect function arguments and set hard spaces in between .\" NS .\" NS modifies: .\" NS doc-func-arg Modified: projects/geom-events/contrib/groff/tmac/groff_mdoc.man ============================================================================== --- projects/geom-events/contrib/groff/tmac/groff_mdoc.man Sun Dec 18 00:24:11 2011 (r228675) +++ projects/geom-events/contrib/groff/tmac/groff_mdoc.man Sun Dec 18 00:31:06 2011 (r228676) @@ -769,13 +769,18 @@ By default, the following architecture k . \# we use `No' to avoid hyphenation .Bd -ragged -offset indent -.No alpha , acorn26 , acorn32 , algor , amd64 , amiga , arc , arm26 , -.No arm32 , atari , bebox , cats , cesfic , cobalt , dreamcast , evbarm , -.No evbmips , evbppc , evbsh3 , hp300 , hp700 , hpcmips , i386 , luna68k , -.No m68k , mac68k , macppc , mips , mmeye , mvme68k , mvmeppc , netwinder , -.No news68k , newsmips , next68k , ofppc , pc532 , pmax , pmppc , powerpc , -.No prep , sandpoint , sgimips , sh3 , shark , sparc , sparc64 , sun3 , *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112180031.pBI0V7LI083881>