Date: Wed, 27 Feb 2008 21:29:49 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 136370 for review Message-ID: <200802272129.m1RLTnee029620@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=136370 Change 136370 by sam@sam_ebb on 2008/02/27 21:29:44 IFC @ 136369 Affected files ... .. //depot/projects/vap/Makefile.inc1#6 integrate .. //depot/projects/vap/bin/sh/cd.c#3 integrate .. //depot/projects/vap/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/vap/contrib/traceroute/as.c#1 branch .. //depot/projects/vap/contrib/traceroute/as.h#1 branch .. //depot/projects/vap/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/vap/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/vap/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/vap/include/unistd.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/vap/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/flt_rounds.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetmask.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetround.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetsticky.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpsetmask.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpsetround.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/vap/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/vap/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_exp.c#3 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_log.c#3 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/vap/lib/msun/powerpc/fenv.h#3 integrate .. //depot/projects/vap/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acosh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acoshf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atanh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atanhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_cosh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_exp.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_expf.c#5 integrate .. //depot/projects/vap/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_fmodf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gamma.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gamma_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gammaf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gammaf_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j0.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j0f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j1.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j1f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_jn.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_jnf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgamma.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgamma_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgammaf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgammaf_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log10f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_scalbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_sinh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_rem_pio2.c#5 integrate .. //depot/projects/vap/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_tan.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/math_private.h#6 integrate .. //depot/projects/vap/lib/msun/src/s_asinh.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_asinhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_atanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ceilf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_erf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_erff.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_exp2.c#5 integrate .. //depot/projects/vap/lib/msun/src/s_exp2f.c#6 integrate .. //depot/projects/vap/lib/msun/src/s_fabsf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_finitef.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_floorf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_frexp.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogb.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogbl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafter.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafterf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafterl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nexttoward.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nexttowardf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/vap/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_rintl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_significandf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_trunc.c#4 integrate .. //depot/projects/vap/lib/msun/src/w_cabs.c#4 integrate .. //depot/projects/vap/release/Makefile#4 integrate .. //depot/projects/vap/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/setup.c#3 integrate .. //depot/projects/vap/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/vap/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/vap/sbin/ping6/ping6.c#3 integrate .. //depot/projects/vap/share/man/man4/ip6.4#3 integrate .. //depot/projects/vap/share/man/man4/uscanner.4#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#5 integrate .. //depot/projects/vap/share/man/man9/VOP_LOCK.9#5 integrate .. //depot/projects/vap/share/man/man9/insmntque.9#1 branch .. //depot/projects/vap/share/man/man9/lock.9#6 integrate .. //depot/projects/vap/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/vap/share/man/man9/vgone.9#3 integrate .. //depot/projects/vap/share/man/man9/vhold.9#3 integrate .. //depot/projects/vap/share/man/man9/vput.9#3 integrate .. //depot/projects/vap/share/man/man9/vref.9#3 integrate .. //depot/projects/vap/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/vap/share/man/man9/vrele.9#3 integrate .. //depot/projects/vap/share/misc/committers-doc.dot#3 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#4 integrate .. //depot/projects/vap/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/vap/sys/arm/include/_bus.h#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/vap/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/vap/sys/boot/common/load_elf.c#5 integrate .. //depot/projects/vap/sys/boot/powerpc/Makefile#4 integrate .. //depot/projects/vap/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vap/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/vap/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vap/sys/conf/NOTES#9 integrate .. //depot/projects/vap/sys/conf/files#19 integrate .. //depot/projects/vap/sys/conf/files.powerpc#8 integrate .. //depot/projects/vap/sys/conf/ldscript.powerpc#3 integrate .. //depot/projects/vap/sys/conf/options.powerpc#4 integrate .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/vap/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mbufq.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/vap/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/vap/sys/dev/usb/umass.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/vap/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/vap/sys/fs/coda/TODO#4 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/vap/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/vap/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#9 integrate .. //depot/projects/vap/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/vap/sys/kern/vnode_if.src#7 integrate .. //depot/projects/vap/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/vap/sys/libkern/quad.h#3 integrate .. //depot/projects/vap/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/vap/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/vap/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/vap/sys/modules/hwpmc/Makefile#5 integrate .. //depot/projects/vap/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/vap/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/vap/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_conn.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/vap/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/vap/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/float.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/vap/sys/powerpc/include/metadata.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vap/sys/sys/buf.h#9 integrate .. //depot/projects/vap/sys/sys/ktrace.h#5 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#9 integrate .. //depot/projects/vap/sys/sys/param.h#10 integrate .. //depot/projects/vap/sys/sys/vnode.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_rawread.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/vap/sys/vm/vm_object.c#7 integrate .. //depot/projects/vap/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/vap/usr.bin/Makefile#4 integrate .. //depot/projects/vap/usr.bin/ar/Makefile#1 branch .. //depot/projects/vap/usr.bin/ar/ar.1#1 branch .. //depot/projects/vap/usr.bin/ar/ar.c#1 branch .. //depot/projects/vap/usr.bin/ar/ar.h#1 branch .. //depot/projects/vap/usr.bin/ar/read.c#1 branch .. //depot/projects/vap/usr.bin/ar/util.c#1 branch .. //depot/projects/vap/usr.bin/ar/write.c#1 branch .. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/vap/usr.bin/du/du.1#3 integrate .. //depot/projects/vap/usr.bin/du/du.c#3 integrate .. //depot/projects/vap/usr.bin/find/extern.h#3 integrate .. //depot/projects/vap/usr.bin/find/find.1#3 integrate .. //depot/projects/vap/usr.bin/find/find.h#3 integrate .. //depot/projects/vap/usr.bin/find/function.c#3 integrate .. //depot/projects/vap/usr.bin/find/option.c#3 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/vap/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/vap/usr.bin/ktrace/ktrace.1#3 integrate .. //depot/projects/vap/usr.bin/ktrace/ktrace.h#3 integrate .. //depot/projects/vap/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/vap/usr.sbin/pmcstat/Makefile#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/vap/usr.sbin/pw/pw_group.c#3 integrate .. //depot/projects/vap/usr.sbin/sa/db.c#3 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/vap/usr.sbin/traceroute/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -872,6 +872,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +889,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -967,6 +972,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/vap/bin/sh/cd.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/vap/contrib/tcpdump/print-802_11.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/vap/contrib/traceroute/traceroute.8#3 (text+ko) ==== @@ -14,9 +14,9 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $ .\" -.TH TRACEROUTE 8 "21 September 2000" +.TH TRACEROUTE 8 "19 February 2008" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dDeFISnrvx +.B \-adDeFISnrvx ] [ .B \-f .I first_ttl @@ -71,6 +71,9 @@ .B \-w .I waittime ] [ +.B \-A +.I as_server +] [ .B \-z .I pausemsecs ] @@ -98,6 +101,13 @@ .PP Other options are: .TP +.B \-a +Turn on AS# lookups for each hop encountered. +.TP +.B -A +Turn on AS# lookups and use the given server instead of the +default. +.TP .B \-e Firewall evasion mode. Use fixed destination ports for UDP and TCP probes. @@ -443,3 +453,7 @@ router that's filtering packets), but this is not implemented yet. .PP Please send bug reports to traceroute@ee.lbl.gov. +.PP +The AS number capability reports information that may sometimes be +inaccurate due to discrepancies between the contents of the +routing database server and the current state of the Internet. ==== //depot/projects/vap/contrib/traceroute/traceroute.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; #endif /* @@ -263,6 +263,7 @@ #include "findsaddr.h" #include "ifaddrlist.h" +#include "as.h" #include "traceroute.h" /* Maximum number of gateways (include room for one noop) */ @@ -350,6 +351,9 @@ int verbose; int waittime = 5; /* time to wait for response (in seconds) */ int nflag; /* print addresses numerically */ +int as_path; /* print as numbers for each hop */ +char *as_server = NULL; +void *asn; #ifdef CANT_HACK_IPCKSUM int doipcksum = 0; /* don't calculate ip checksums by default */ #else @@ -535,9 +539,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { - + case 'a': + as_path = 1; + break; + + case 'A': + as_path = 1; + as_server = optarg; + break; + case 'd': options |= SO_DEBUG; break; @@ -913,6 +925,16 @@ exit (1); } + if (as_path) { + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + } + } + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) if (setpolicy(sndsock, "in bypass") < 0) errx(1, "%s", ipsec_strerror()); @@ -1118,6 +1140,8 @@ (unreachable > 0 && unreachable >= nprobes - 1)) break; } + if (as_path) + as_shutdown(asn); exit(0); } @@ -1458,6 +1482,9 @@ hlen = ip->ip_hl << 2; cc -= hlen; + if (as_path) + Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + if (nflag) Printf(" %s", inet_ntoa(from->sin_addr)); else @@ -1764,8 +1791,8 @@ Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" + "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); + "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); exit(1); } ==== //depot/projects/vap/gnu/lib/libgcc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#5 (text+ko) ==== @@ -23,7 +23,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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.62 2007/11/27 10:00:33 jkoshy Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.63 2008/02/23 19:27:54 ru Exp $ .\" .\" %beginstrip% . @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.0 +.ds doc-default-operating-system FreeBSD\~8.0 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 ==== //depot/projects/vap/include/unistd.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $ + * $FreeBSD: src/include/unistd.h,v 1.84 2008/02/26 20:33:52 ru Exp $ */ #ifndef _UNISTD_H_ @@ -405,7 +405,7 @@ /* 1003.1-2001 */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE int fchown(int, uid_t, gid_t); -ssize_t readlink(const char *, char *, size_t); +ssize_t readlink(const char * __restrict, char * __restrict, size_t); #endif #if __POSIX_VISIBLE >= 200112 int gethostname(char *, size_t); ==== //depot/projects/vap/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's <sys/endian.h> */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802272129.m1RLTnee029620>