Date: Thu, 14 Aug 2008 15:29:51 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 147390 for review Message-ID: <200808141529.m7EFTppv096914@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147390 Change 147390 by thompsa@thompsa_burger on 2008/08/14 15:29:51 IFC @147386 Affected files ... .. //depot/projects/vap/contrib/gcc/common.opt#3 integrate .. //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#4 integrate .. //depot/projects/vap/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/vap/etc/periodic/security/550.ipfwlimit#3 integrate .. //depot/projects/vap/games/random/random.c#4 integrate .. //depot/projects/vap/games/random/randomize_fd.c#4 integrate .. //depot/projects/vap/games/random/randomize_fd.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/vap/lib/libbluetooth/Makefile#3 integrate .. //depot/projects/vap/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/vap/lib/libbluetooth/bluetooth.h#3 integrate .. //depot/projects/vap/lib/libgeom/geom_xml2tree.c#4 integrate .. //depot/projects/vap/lib/libpcap/config.h#3 integrate .. //depot/projects/vap/lib/libthread_db/thread_db.h#4 integrate .. //depot/projects/vap/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/vap/sbin/geom/class/virstor/geom_virstor.c#3 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#26 edit .. //depot/projects/vap/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/vap/share/man/man4/Makefile#18 integrate .. //depot/projects/vap/share/man/man4/bpf.4#6 integrate .. //depot/projects/vap/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/vap/share/man/man4/miibus.4#4 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vap/sys/amd64/amd64/db_disasm.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/vap/sys/conf/files#47 integrate .. //depot/projects/vap/sys/conf/files.i386#15 integrate .. //depot/projects/vap/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/vap/sys/dev/age/if_age.c#4 integrate .. //depot/projects/vap/sys/dev/aha/aha.c#5 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/vap/sys/dev/cpufreq/ichss.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_lro.c#3 delete .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/vap/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vap/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vap/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vap/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/vap/sys/dev/iicbus/ds1339.c#3 delete .. //depot/projects/vap/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vap/sys/dev/led/led.c#7 integrate .. //depot/projects/vap/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#15 integrate .. //depot/projects/vap/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vap/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vap/sys/dev/usb/umass.c#9 integrate .. //depot/projects/vap/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/vap/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vap/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vap/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vap/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vap/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vap/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vap/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vap/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vap/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vap/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/vap/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/vap/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/vap/sys/geom/geom_ccd.c#5 integrate .. //depot/projects/vap/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/vap/sys/geom/geom_disk.c#7 integrate .. //depot/projects/vap/sys/geom/geom_kern.c#6 integrate .. //depot/projects/vap/sys/geom/geom_slice.c#5 integrate .. //depot/projects/vap/sys/geom/geom_subr.c#10 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#8 integrate .. //depot/projects/vap/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#16 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#11 integrate .. //depot/projects/vap/sys/i386/cpufreq/p4tcc.c#6 integrate .. //depot/projects/vap/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/vap/sys/i386/cpufreq/smist.c#5 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/vap/sys/i386/i386/db_disasm.c#3 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#10 integrate .. //depot/projects/vap/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vap/sys/i386/xen/clock.c#1 branch .. //depot/projects/vap/sys/i386/xen/exception.s#1 branch .. //depot/projects/vap/sys/i386/xen/locore.s#1 branch .. //depot/projects/vap/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vap/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#12 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#13 integrate .. //depot/projects/vap/sys/kern/subr_sbuf.c#6 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#16 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/vap/sys/modules/Makefile#37 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/vap/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vap/sys/modules/sis/Makefile#5 integrate .. //depot/projects/vap/sys/modules/xl/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.c#19 integrate .. //depot/projects/vap/sys/net/if_enc.c#5 integrate .. //depot/projects/vap/sys/net/if_enc.h#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#61 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#6 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#7 integrate .. //depot/projects/vap/sys/pci/if_sis.c#7 delete .. //depot/projects/vap/sys/pci/if_sisreg.h#5 delete .. //depot/projects/vap/sys/pci/if_xl.c#8 delete .. //depot/projects/vap/sys/pci/if_xlreg.h#8 delete .. //depot/projects/vap/sys/rpc/clnt_rc.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit.c#12 integrate .. //depot/projects/vap/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/vap/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/cache.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/cpufunc.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/db_disasm.c#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/locore.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_locore.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/vap/sys/sparc64/sparc64/prof_machdep.c#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/swtch.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/vap/sys/sys/lock.h#9 integrate .. //depot/projects/vap/sys/sys/param.h#27 integrate .. //depot/projects/vap/sys/sys/sbuf.h#3 integrate .. //depot/projects/vap/sys/sys/sx.h#6 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/vap/sys/vm/redzone.c#3 integrate .. //depot/projects/vap/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vap/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vap/sys/xen/gnttab.c#1 branch .. //depot/projects/vap/sys/xen/gnttab.h#1 branch .. //depot/projects/vap/sys/xen/interface/COPYING#1 branch .. //depot/projects/vap/sys/xen/interface/acm.h#1 branch .. //depot/projects/vap/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vap/sys/xen/interface/callback.h#1 branch .. //depot/projects/vap/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vap/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vap/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vap/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vap/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vap/sys/xen/interface/features.h#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vap/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vap/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vap/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vap/sys/xen/interface/memory.h#1 branch .. //depot/projects/vap/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vap/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vap/sys/xen/interface/platform.h#1 branch .. //depot/projects/vap/sys/xen/interface/sched.h#1 branch .. //depot/projects/vap/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vap/sys/xen/interface/trace.h#1 branch .. //depot/projects/vap/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vap/sys/xen/interface/version.h#1 branch .. //depot/projects/vap/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vap/sys/xen/interface/xen.h#1 branch .. //depot/projects/vap/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vap/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vap/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_xs.c#1 branch .. //depot/projects/vap/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/vap/tools/regression/geom/MdLoad/MdLoad.c#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/FlashDevice.sub#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/vap/usr.bin/rpcgen/rpc_svcout.c#3 integrate .. //depot/projects/vap/usr.bin/window/:tt#3 delete .. //depot/projects/vap/usr.bin/window/:tty#3 delete .. //depot/projects/vap/usr.bin/window/:var#3 delete .. //depot/projects/vap/usr.bin/window/:ww#3 delete .. //depot/projects/vap/usr.sbin/cpucontrol/cpucontrol.c#2 integrate .. //depot/projects/vap/usr.sbin/sysinstall/devices.c#5 integrate .. //depot/projects/vap/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/projects/vap/contrib/gcc/common.opt#3 (text+ko) ==== @@ -578,7 +578,7 @@ Does nothing. Preserved for backward compatibility. fmath-errno -Common Report Var(flag_errno_math) Init(1) +Common Report Var(flag_errno_math) Init(0) Set errno after built-in math functions fmem-report ==== //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.76 2008/08/10 19:02:57 das Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -86,11 +86,6 @@ #define TARGET_ELF 1 -/* This goes away when the math emulator is fixed. */ -#undef TARGET_SUBTARGET_DEFAULT -#define TARGET_SUBTARGET_DEFAULT \ - (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) - /* Don't default to pcc-struct-return, we want to retain compatibility with older gcc versions AND pcc-struct-return is nonreentrant. (even though the SVR4 ABI for the i386 says that records and unions are ==== //depot/projects/vap/contrib/gcc/doc/invoke.texi#3 (text+ko) ==== @@ -5677,7 +5677,8 @@ The default is @option{-fmath-errno}. -On Darwin systems, the math library never sets @code{errno}. There is therefore +On Darwin and FreeBSD systems, the math library never sets @code{errno}. +There is therefore no reason for the compiler to consider the possibility that it might, and @option{-fno-math-errno} is the default. @@ -9507,7 +9508,7 @@ @opindex mno-fancy-math-387 Some 387 emulators do not support the @code{sin}, @code{cos} and @code{sqrt} instructions for the 387. Specify this option to avoid -generating those instructions. This option is the default on FreeBSD, +generating those instructions. This option is the default on OpenBSD and NetBSD@. This option is overridden when @option{-march} indicates that the target cpu will always have an FPU and so the instruction will not need emulation. As of revision 2.6.1, these ==== //depot/projects/vap/etc/periodic/security/550.ipfwlimit#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.10 2005/09/11 14:29:58 maxim Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.11 2008/08/10 18:11:24 antoine Exp $ # # Show ipfw rules which have reached the log limit @@ -42,19 +42,16 @@ case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) - IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` - if [ $? -ne 0 ]; then + IPFW_VERBOSE=`sysctl -n net.inet.ip.fw.verbose 2> /dev/null` + if [ $? -ne 0 ] || [ "$IPFW_VERBOSE" -eq 0 ]; then exit 0 fi TMP=`mktemp -t security` ipfw -a list | grep " log " | \ grep '^[[:digit:]]\+[[:space:]]\+[[:digit:]]\+' | \ - awk -v limit="$IPFW_LOG_LIMIT" \ + awk \ '{if ($6 == "logamount") { if ($2 > $7) - {print $0} - } else { - if ($2 > limit) {print $0}} }' > ${TMP} ==== //depot/projects/vap/games/random/random.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/games/random/random.c,v 1.22 2008/08/08 01:42:17 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/random.c,v 1.24 2008/08/11 23:24:42 ache Exp $"); #include <sys/types.h> @@ -162,7 +162,7 @@ /* Compute a random exit status between 0 and denom - 1. */ if (random_exit) - return (int)(denom * random() / RANDOM_MAX); + return (int)(denom * random() / RANDOM_MAX_PLUS1); /* * Select whether to print the first line. (Prime the pump.) @@ -170,7 +170,7 @@ * 0 (which has a 1 / denom chance of being true), we select the * line. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0; while ((ch = getchar()) != EOF) { if (selected) (void)putchar(ch); @@ -180,7 +180,8 @@ err(2, "stdout"); /* Now see if the next line is to be printed. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / + RANDOM_MAX_PLUS1) == 0; } } if (ferror(stdin)) ==== //depot/projects/vap/games/random/randomize_fd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.5 2008/08/08 02:46:47 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.7 2008/08/11 23:24:42 ache Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -175,9 +175,9 @@ (type == RANDOM_TYPE_WORDS && isspace(buf[i])) || (eof && i == buflen - 1)) { make_token: - if (numnode == RANDOM_MAX) { + if (numnode == RANDOM_MAX_PLUS1) { errno = EFBIG; - err(1, "too many lines"); + err(1, "too many delimiters"); } numnode++; n = rand_node_allocate(); @@ -215,8 +215,10 @@ if (n->cp == NULL) break; - if ((int)(denom * random() / RANDOM_MAX) == 0) { - ret = printf("%.*s", (int)n->len - 1, n->cp); + if ((int)(denom * random() / + RANDOM_MAX_PLUS1) == 0) { + ret = printf("%.*s", + (int)n->len - 1, n->cp); if (ret < 0) err(1, "printf"); } ==== //depot/projects/vap/games/random/randomize_fd.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/games/random/randomize_fd.h,v 1.3 2008/08/08 01:42:17 ache Exp $ + * $FreeBSD: src/games/random/randomize_fd.h,v 1.4 2008/08/10 11:31:56 ache Exp $ */ #ifndef __RANDOMIZE_FD__ @@ -33,7 +33,7 @@ * The random() function is defined to return values between 0 and * 2^31 - 1 inclusive in random(3). */ -#define RANDOM_MAX 0x80000000UL +#define RANDOM_MAX_PLUS1 0x80000000UL #define RANDOM_TYPE_UNSET 0 #define RANDOM_TYPE_LINES 1 ==== //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.7 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.8 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -389,6 +389,9 @@ ar = (struct ar_w *)a->format_data; + if (ar == NULL) + return (ARCHIVE_OK); + if (ar->has_strtab > 0) { free(ar->strtab); ar->strtab = NULL; ==== //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.47 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.48 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -1200,6 +1200,9 @@ struct pax *pax; pax = (struct pax *)a->format_data; + if (pax == NULL) + return (ARCHIVE_OK); + archive_string_free(&pax->pax_header); free(pax); a->format_data = NULL; ==== //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); /* * Background: There are two written standards for the tar file format. @@ -93,7 +93,11 @@ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); +#endif } DEFINE_TEST(test_compat_tar_hardlink) ==== //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); #include <locale.h> @@ -149,7 +149,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -175,7 +179,11 @@ assertEqualString(longname, archive_entry_pathname(entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } /* @@ -249,7 +257,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -293,5 +305,9 @@ assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } ==== //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.5 2008/06/26 11:50:11 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.6 2008/08/10 03:13:42 kientzle Exp $"); DEFINE_TEST(test_read_format_zip) { @@ -51,12 +51,14 @@ assertEqualString("file1", archive_entry_pathname(ae)); assertEqualInt(1179604289, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("archive_read_data() returns number of bytes read"); assertEqualInt(18, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); ==== //depot/projects/vap/lib/libarchive/test/test_tar_large.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.3 2008/08/10 21:14:26 kientzle Exp $"); #include <errno.h> #include <stdlib.h> @@ -179,7 +179,6 @@ #else static off_t memory_read_skip(struct archive *a, void *_private, off_t skip) -#endif { struct memdata *private = _private; @@ -198,6 +197,7 @@ } return (skip); } +#endif DEFINE_TEST(test_tar_large) { ==== //depot/projects/vap/lib/libarchive/test/test_ustar_filenames.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $"); /* * Exercise various lengths of filenames in ustar archives. @@ -111,7 +111,11 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); - assertA(0 == archive_write_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else + assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now, read the data back. @@ -153,7 +157,11 @@ failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen); assertEqualInt(1, archive_read_next_header(a, &ae)); assert(0 == archive_read_close(a)); - assert(0 == archive_read_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else + assertEqualInt(0, archive_read_finish(a)); +#endif } DEFINE_TEST(test_ustar_filenames) ==== //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); #define UMASK 022 @@ -131,7 +131,11 @@ assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else assertEqualInt(0, archive_write_finish(ad)); +#endif /* Test the entries on disk. */ assert(0 == stat("link1a", &st)); ==== //depot/projects/vap/lib/libarchive/test/test_write_format_tar_ustar.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $"); static int is_null(const char *p, size_t l) @@ -188,7 +188,11 @@ assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assert(0 == archive_write_finish(a)); +#endif /* * Verify the archive format. ==== //depot/projects/vap/lib/libbluetooth/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $ -# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.3 2007/05/21 02:49:02 deischen Exp $ +# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.4 2008/08/13 19:35:31 emax Exp $ LIB= bluetooth MAN= bluetooth.3 @@ -27,4 +27,8 @@ MLINKS+= bluetooth.3 bt_ntoa.3 MLINKS+= bluetooth.3 bt_aton.3 +MLINKS+= bluetooth.3 bdaddr_same.3 +MLINKS+= bluetooth.3 bdaddr_any.3 +MLINKS+= bluetooth.3 bdaddr_copy.3 + .include <bsd.lib.mk> ==== //depot/projects/vap/lib/libbluetooth/bluetooth.3#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.7 2005/01/21 10:26:11 ru Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.8 2008/08/13 19:35:31 emax Exp $ .\" -.Dd May 7, 2003 +.Dd August 13, 2008 .Dt BLUETOOTH 3 .Os .Sh NAME @@ -40,7 +40,10 @@ .Nm bt_setprotoent , .Nm bt_endprotoent , .Nm bt_aton , -.Nm bt_ntoa +.Nm bt_ntoa , +.Nm bdaddr_same , +.Nm bdaddr_any , +.Nm bdaddr_copy .Nd Bluetooth routines .Sh LIBRARY .Lb libbluetooth @@ -70,6 +73,12 @@ .Fn bt_aton "const char *str" "bdaddr_t *ba" .Ft const char * .Fn bt_ntoa "const bdaddr_t *ba" "char *str" +.Ft int +.Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b" +.Ft int +.Fn bdaddr_any "const bdaddr_t *a" +.Ft int +.Fn bdaddr_copy "const bdaddr_t *dst" "const bdaddr_t *src" .Sh DESCRIPTION The .Fn bt_gethostent , @@ -186,6 +195,28 @@ string representing the address into the buffer provided. It is up to the caller to ensure that provided buffer has enough space. If no buffer was provided then internal static buffer will be used. +.Pp +The +.Fn bdaddr_same , +.Fn bdaddr_any +and +.Fn bdaddr_copy +are handy shorthand Bluetooth address utility functions. +The +.Fn bdaddr_same +function will test if two provided BD_ADDRs are the same. +The +.Fn bdaddr_any +function will test if provided BD_ADDR is +.Dv ANY +BD_ADDR. +The +.Fn bdaddr_copy +function will copy provided +.Fa src +BD_ADDR into provided +.Fa dst +BD_ADDR. .Sh FILES .Bl -tag -width ".Pa /etc/bluetooth/hosts" -compact .It Pa /etc/bluetooth/hosts ==== //depot/projects/vap/lib/libbluetooth/bluetooth.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $ - * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.2 2005/03/17 21:39:44 emax Exp $ + * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.3 2008/08/13 19:35:31 emax Exp $ */ #ifndef _BLUETOOTH_H_ @@ -72,6 +72,36 @@ char const * bt_ntoa (bdaddr_t const *ba, char *str); int bt_aton (char const *str, bdaddr_t *ba); +/* + * bdaddr utility functions (from NetBSD) + */ + +static __inline int +bdaddr_same(const bdaddr_t *a, const bdaddr_t *b) +{ + return (a->b[0] == b->b[0] && a->b[1] == b->b[1] && + a->b[2] == b->b[2] && a->b[3] == b->b[3] && + a->b[4] == b->b[4] && a->b[5] == b->b[5]); +} + +static __inline int +bdaddr_any(const bdaddr_t *a) +{ + return (a->b[0] == 0 && a->b[1] == 0 && a->b[2] == 0 && + a->b[3] == 0 && a->b[4] == 0 && a->b[5] == 0); +} + +static __inline void +bdaddr_copy(bdaddr_t *d, const bdaddr_t *s) +{ + d->b[0] = s->b[0]; + d->b[1] = s->b[1]; + d->b[2] = s->b[2]; + d->b[3] = s->b[3]; + d->b[4] = s->b[4]; + d->b[5] = s->b[5]; +} + __END_DECLS #endif /* ndef _BLUETOOTH_H_ */ ==== //depot/projects/vap/lib/libgeom/geom_xml2tree.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.6 2008/07/08 17:34:50 lulf Exp $ + * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.7 2008/08/09 11:14:05 des Exp $ */ #include <stdio.h> @@ -68,7 +68,7 @@ mt = userData; mt->level++; - mt->sbuf[mt->level] = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + mt->sbuf[mt->level] = sbuf_new_auto(); id = NULL; ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { ==== //depot/projects/vap/lib/libpcap/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libpcap/config.h,v 1.6 2007/10/16 02:10:44 mlaier Exp $ */ +/* $FreeBSD: src/lib/libpcap/config.h,v 1.7 2008/08/13 15:41:21 ed Exp $ */ /* This is an edited copy of the config.h generated by configure. */ /* config.h. Generated by configure. */ @@ -15,7 +15,7 @@ /* #undef BDEBUG */ /* define if you have a cloning BPF device */ -/* #undef HAVE_CLONING_BPF */ +#define HAVE_CLONING_BPF 1 /* define if you have the DAG API */ /* #undef HAVE_DAG_API */ ==== //depot/projects/vap/lib/libthread_db/thread_db.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.7 2008/07/30 00:59:19 marcel Exp $ + * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.8 2008/08/13 00:03:35 marcel Exp $ */ #ifndef _THREAD_DB_H_ @@ -184,7 +184,7 @@ int ti_pri; lwpid_t ti_lid; char ti_db_suspended; - char ti_traceme; + int ti_traceme; sigset_t ti_sigmask; sigset_t ti_pending; psaddr_t ti_tls; ==== //depot/projects/vap/sbin/geom/class/eli/geli.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.22 2007/09/01 06:33:01 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.23 2008/08/12 19:42:03 pjd Exp $ .\" .Dd September 16, 2006 .Dt GELI 8 @@ -81,7 +81,7 @@ .Op Fl e Ar ealgo .Op Fl l Ar keylen .Op Fl s Ar sectorsize -.Ar prov ... +.Ar prov .Nm .Cm configure .Op Fl bB ==== //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.24 2007/05/15 20:25:16 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.25 2008/08/12 19:42:03 pjd Exp $"); #include <stdio.h> #include <stdint.h> @@ -82,7 +82,7 @@ * attach [-dprv] [-k keyfile] prov * detach [-fl] prov ... * stop - alias for 'detach' - * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov ... + * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov * configure [-bB] prov ... * setkey [-pPv] [-n keyno] [-k keyfile] [-K newkeyfile] prov * delkey [-afv] [-n keyno] prov @@ -156,7 +156,7 @@ { 's', "sectorsize", §orsize, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - NULL, "[-d] [-a aalgo] [-e ealgo] [-l keylen] [-s sectorsize] prov ..." + NULL, "[-d] [-a aalgo] [-e ealgo] [-l keylen] [-s sectorsize] prov" }, { "configure", G_FLAG_VERBOSE, eli_main, { ==== //depot/projects/vap/sbin/geom/class/virstor/geom_virstor.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.2 2007/11/18 03:17:56 jb Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.3 2008/08/09 16:47:30 ivoras Exp $"); #include <sys/param.h> #include <errno.h> @@ -157,7 +157,6 @@ off_t mediasize; u_char *sector; int error, fd; - ssize_t abc; pathgen(name, path, sizeof(path)); sector = NULL; @@ -183,7 +182,7 @@ goto out; } bcopy(md, sector, size); - if ((abc = pwrite(fd, sector, sectorsize, mediasize - sectorsize)) != + if (pwrite(fd, sector, sectorsize, mediasize - sectorsize) != (ssize_t)sectorsize) { error = errno; goto out; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808141529.m7EFTppv096914>