PERFORCE change 85136 for review

Peter Wemm peter at FreeBSD.org
Tue Oct 11 13:24:11 PDT 2005


http://perforce.freebsd.org/chv.cgi?CH=85136

Change 85136 by peter at peter_daintree on 2005/10/11 20:22:56

	IFC @85135

Affected files ...

.. //depot/projects/hammer/ObsoleteFiles.inc#8 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#5 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#5 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#6 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#9 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis_.c#1 branch
.. //depot/projects/hammer/crypto/openssl/ssl/s23_srvr.c#3 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#62 integrate
.. //depot/projects/hammer/etc/rc.d/hcsecd#1 branch
.. //depot/projects/hammer/etc/rc.d/sdpd#1 branch
.. //depot/projects/hammer/etc/rc.firewall6#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/hammer/lib/csu/amd64/crt1.c#6 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/crt1.c#6 integrate
.. //depot/projects/hammer/lib/libdevstat/devstat.c#9 integrate
.. //depot/projects/hammer/lib/libedit/editline.3#7 integrate
.. //depot/projects/hammer/lib/libedit/el.c#3 integrate
.. //depot/projects/hammer/lib/libedit/makelist#4 integrate
.. //depot/projects/hammer/lib/libedit/map.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#18 integrate
.. //depot/projects/hammer/lib/libutil/trimdomain.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/k_cosf.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/k_rem_pio2f.c#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#81 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#31 integrate
.. //depot/projects/hammer/sbin/devd/devd.cc#14 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#2 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#6 integrate
.. //depot/projects/hammer/sbin/mount/Makefile#5 integrate
.. //depot/projects/hammer/sbin/mount/extern.h#2 integrate
.. //depot/projects/hammer/sbin/mount/getmntopts.c#6 integrate
.. //depot/projects/hammer/sbin/mount/mount.c#18 integrate
.. //depot/projects/hammer/sbin/mount/mount_ufs.c#5 integrate
.. //depot/projects/hammer/sbin/reboot/boot_i386.8#14 integrate
.. //depot/projects/hammer/sbin/setkey/Makefile#1 branch
.. //depot/projects/hammer/sbin/setkey/parse.y#1 branch
.. //depot/projects/hammer/sbin/setkey/sample.cf#1 branch
.. //depot/projects/hammer/sbin/setkey/scriptdump.pl#1 branch
.. //depot/projects/hammer/sbin/setkey/setkey.8#1 branch
.. //depot/projects/hammer/sbin/setkey/setkey.c#1 branch
.. //depot/projects/hammer/sbin/setkey/test-pfkey.c#1 branch
.. //depot/projects/hammer/sbin/setkey/test-policy.c#1 branch
.. //depot/projects/hammer/sbin/setkey/token.l#1 branch
.. //depot/projects/hammer/sbin/setkey/vchar.h#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#77 integrate
.. //depot/projects/hammer/share/man/man4/altq.4#10 integrate
.. //depot/projects/hammer/share/man/man4/an.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ath.4#28 integrate
.. //depot/projects/hammer/share/man/man4/aue.4#10 integrate
.. //depot/projects/hammer/share/man/man4/awi.4#10 integrate
.. //depot/projects/hammer/share/man/man4/axe.4#10 integrate
.. //depot/projects/hammer/share/man/man4/bfe.4#5 integrate
.. //depot/projects/hammer/share/man/man4/bge.4#16 integrate
.. //depot/projects/hammer/share/man/man4/cdce.4#6 integrate
.. //depot/projects/hammer/share/man/man4/cm.4#6 integrate
.. //depot/projects/hammer/share/man/man4/cue.4#8 integrate
.. //depot/projects/hammer/share/man/man4/dc.4#18 integrate
.. //depot/projects/hammer/share/man/man4/dcons.4#5 integrate
.. //depot/projects/hammer/share/man/man4/de.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ed.4#12 integrate
.. //depot/projects/hammer/share/man/man4/em.4#12 integrate
.. //depot/projects/hammer/share/man/man4/en.4#7 integrate
.. //depot/projects/hammer/share/man/man4/fwe.4#7 integrate
.. //depot/projects/hammer/share/man/man4/fwip.4#5 integrate
.. //depot/projects/hammer/share/man/man4/fxp.4#12 integrate
.. //depot/projects/hammer/share/man/man4/hme.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#5 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#6 integrate
.. //depot/projects/hammer/share/man/man4/kue.4#9 integrate
.. //depot/projects/hammer/share/man/man4/lge.4#6 integrate
.. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#14 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#16 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#12 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ray.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/vx.4#7 integrate
.. //depot/projects/hammer/share/man/man4/my.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ng_iface.4#5 integrate
.. //depot/projects/hammer/share/man/man4/nge.4#8 integrate
.. //depot/projects/hammer/share/man/man4/nve.4#5 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#14 integrate
.. //depot/projects/hammer/share/man/man4/pcn.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#4 integrate
.. //depot/projects/hammer/share/man/man4/re.4#15 integrate
.. //depot/projects/hammer/share/man/man4/rl.4#16 integrate
.. //depot/projects/hammer/share/man/man4/rue.4#10 integrate
.. //depot/projects/hammer/share/man/man4/sf.4#6 integrate
.. //depot/projects/hammer/share/man/man4/sis.4#9 integrate
.. //depot/projects/hammer/share/man/man4/sk.4#11 integrate
.. //depot/projects/hammer/share/man/man4/sn.4#9 integrate
.. //depot/projects/hammer/share/man/man4/snd_mss.4#1 branch
.. //depot/projects/hammer/share/man/man4/ste.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ti.4#11 integrate
.. //depot/projects/hammer/share/man/man4/tl.4#7 integrate
.. //depot/projects/hammer/share/man/man4/tx.4#6 integrate
.. //depot/projects/hammer/share/man/man4/txp.4#9 integrate
.. //depot/projects/hammer/share/man/man4/udav.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ural.4#5 integrate
.. //depot/projects/hammer/share/man/man4/vge.4#6 integrate
.. //depot/projects/hammer/share/man/man4/vlan.4#13 integrate
.. //depot/projects/hammer/share/man/man4/vr.4#12 integrate
.. //depot/projects/hammer/share/man/man4/wb.4#6 integrate
.. //depot/projects/hammer/share/man/man4/wi.4#24 integrate
.. //depot/projects/hammer/share/man/man4/xe.4#9 integrate
.. //depot/projects/hammer/share/man/man4/xl.4#14 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#38 integrate
.. //depot/projects/hammer/share/man/man5/style.Makefile.5#9 integrate
.. //depot/projects/hammer/share/man/man7/build.7#11 integrate
.. //depot/projects/hammer/share/man/man7/development.7#8 integrate
.. //depot/projects/hammer/share/man/man7/release.7#28 integrate
.. //depot/projects/hammer/share/man/man8/diskless.8#11 integrate
.. //depot/projects/hammer/share/man/man9/EVENTHANDLER.9#3 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#58 integrate
.. //depot/projects/hammer/share/man/man9/critical_enter.9#2 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#81 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#9 integrate
.. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#4 integrate
.. //depot/projects/hammer/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#35 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#9 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#22 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#20 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#15 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#33 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#33 integrate
.. //depot/projects/hammer/sys/compat/ndis/winx32_wrap.S#2 integrate
.. //depot/projects/hammer/sys/conf/NOTES#100 integrate
.. //depot/projects/hammer/sys/conf/files#126 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#40 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#50 integrate
.. //depot/projects/hammer/sys/conf/options#86 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#32 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_cam.c#14 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_debug.c#9 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#24 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_tables.h#3 integrate
.. //depot/projects/hammer/sys/dev/aac/aacreg.h#10 integrate
.. //depot/projects/hammer/sys/dev/aac/aacvar.h#13 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#33 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#61 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#22 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#30 integrate
.. //depot/projects/hammer/sys/dev/dc/dcphy.c#1 branch
.. //depot/projects/hammer/sys/dev/dc/if_dc.c#1 branch
.. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#1 branch
.. //depot/projects/hammer/sys/dev/dc/pnphy.c#1 branch
.. //depot/projects/hammer/sys/dev/ed/ax88x90reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ed/dl100xxreg.h#1 branch
.. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#11 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#30 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_rtl80x9.c#1 branch
.. //depot/projects/hammer/sys/dev/ed/if_edreg.h#6 integrate
.. //depot/projects/hammer/sys/dev/ed/if_edvar.h#12 integrate
.. //depot/projects/hammer/sys/dev/ed/rtl80x9reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ed/tc5299jreg.h#1 branch
.. //depot/projects/hammer/sys/dev/em/if_em.c#47 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#25 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#9 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#53 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#6 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#41 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#17 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#11 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#5 integrate
.. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#14 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#53 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#10 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#33 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#42 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#37 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#10 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#33 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#22 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#15 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#15 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vge.c#12 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx.c#21 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#10 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vxvar.h#6 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xereg.h#3 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#22 integrate
.. //depot/projects/hammer/sys/geom/geom_gpt.c#22 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#75 integrate
.. //depot/projects/hammer/sys/ia64/ia64/nexus.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_poll.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_uuid.c#9 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#45 integrate
.. //depot/projects/hammer/sys/kern/subr_rman.c#18 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#60 integrate
.. //depot/projects/hammer/sys/modules/ed/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/lmc/Makefile#3 integrate
.. //depot/projects/hammer/sys/net/bridgestp.c#5 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#48 integrate
.. //depot/projects/hammer/sys/net/if_fwsubr.c#11 integrate
.. //depot/projects/hammer/sys/net/netisr.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#37 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ether.c#22 integrate
.. //depot/projects/hammer/sys/netgraph/ng_iface.c#22 integrate
.. //depot/projects/hammer/sys/netgraph/ng_tty.c#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#11 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#50 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#51 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#49 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#36 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#42 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#40 integrate
.. //depot/projects/hammer/sys/pci/if_vr.c#36 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#59 integrate
.. //depot/projects/hammer/sys/security/mac/mac_process.c#8 integrate
.. //depot/projects/hammer/sys/sys/cdefs.h#21 integrate
.. //depot/projects/hammer/sys/sys/libkern.h#13 integrate
.. //depot/projects/hammer/sys/sys/param.h#67 integrate
.. //depot/projects/hammer/sys/sys/rman.h#12 integrate
.. //depot/projects/hammer/sys/sys/uuid.h#6 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#24 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#38 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#53 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#36 integrate
.. //depot/projects/hammer/sys/vm/uma.h#14 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#44 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#43 integrate
.. //depot/projects/hammer/tools/regression/geom_gpt/gctl.t#2 integrate
.. //depot/projects/hammer/tools/regression/lib/libutil/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch
.. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain.t#1 branch
.. //depot/projects/hammer/tools/tools/README#18 integrate
.. //depot/projects/hammer/tools/tools/iwi/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/iwi/iwistats.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/http/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/http/http.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/httpd/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/httpd/httpd.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/tcpconnect/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/tcpconnect/tcpconnect.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/tcpreceive/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/tcpreceive/tcpreceive.c#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_6.rc#2 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_6.rc#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#40 integrate
.. //depot/projects/hammer/usr.bin/gprof/gprof.1#7 integrate
.. //depot/projects/hammer/usr.bin/gprof/printgprof.c#4 integrate
.. //depot/projects/hammer/usr.bin/lockf/lockf.c#3 integrate
.. //depot/projects/hammer/usr.bin/mail/mail.1#6 integrate
.. //depot/projects/hammer/usr.bin/mail/main.c#3 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#29 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#26 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/test-pkg_version.sh#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#17 integrate
.. //depot/projects/hammer/usr.sbin/wpa/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/ndis_events/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.8#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.c#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.c#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.h#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/ntddndis.h#1 branch

Differences ...

==== //depot/projects/hammer/ObsoleteFiles.inc#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.17 2005/09/28 09:19:17 mlaier Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.18 2005/10/08 22:51:47 thompsa Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -16,7 +16,6 @@
 
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
-OLD_FILES+=usr/share/man/man4/bridge.4.gz
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz

==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#5 (text+ko) ====

@@ -43,6 +43,16 @@
 #include <assert.h>
 #include "asn1.h"
 
+#if !defined(INT32_MIN)
+#define	INT32_MIN	(-0x7fffffff-1)
+#endif
+#if !defined(INT32_MAX)
+#define	INT32_MAX	(0x7fffffff)
+#endif
+#if !defined(UINT32_MAX)
+#define	UINT32_MAX	(0xffffffff)
+#endif
+
 static void asn_error_func(const struct asn_buf *, const char *, ...);
 
 void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func;

==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#5 (text+ko) ====

@@ -179,14 +179,4 @@
 	ASN_EXCEPT_ENDOFMIBVIEW	= 0x02,
 };
 
-#if !defined(INT32_MIN)
-#define	INT32_MIN	(-0x7fffffff-1)
-#endif
-#if !defined(INT32_MAX)
-#define	INT32_MAX	(0x7fffffff)
-#endif
-#if !defined(UINT32_MAX)
-#define	UINT32_MAX	(0xffffffff)
-#endif
-
 #endif

==== //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ====

@@ -64,6 +64,14 @@
 #include "snmpclient.h"
 #include "snmppriv.h"
 
+#if !defined(INT32_MAX)
+#define	INT32_MAX	(0x7fffffff)
+#endif
+#if !defined(UINT32_MAX)
+#define	UINT32_MAX	(0xffffffff)
+#endif
+
+
 /* global context */
 struct snmp_client snmp_client;
 

==== //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 (text+ko) ====

@@ -55,6 +55,16 @@
 #include "ntp_tree.h"
 #include "ntp_oid.h"
 
+#if !defined(INT32_MIN)
+#define	INT32_MIN	(-0x7fffffff-1)
+#endif
+#if !defined(INT32_MAX)
+#define	INT32_MAX	(0x7fffffff)
+#endif
+#if !defined(UINT32_MAX)
+#define	UINT32_MAX	(0xffffffff)
+#endif
+
 #define	NTPC_MAX	576
 #define	NTPC_VERSION	3
 #define	NTPC_MODE	6

==== //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#9 (text+ko) ====

@@ -57,6 +57,10 @@
 #include "tree.h"
 #include "oid.h"
 
+#if !defined(INT32_MAX)
+#define	INT32_MAX	(0x7fffffff)
+#endif
+
 #define	PATH_PID	"/var/run/%s.pid"
 #define PATH_CONFIG	"/etc/%s.config"
 

==== //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.1 2005/06/05 20:55:01 sam Exp $
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.2 2005/10/10 17:48:01 wpaul Exp $
 .cvsignore
 README-Windows.txt
 driver_atmel.c
@@ -7,9 +7,6 @@
 driver_hostap.c
 driver_ipw.c
 driver_madwifi.c
-driver_ndis.c
-driver_ndis.h
-driver_ndis_.c
 driver_ndiswrapper.c
 driver_prism54.c
 driver_test.c

==== //depot/projects/hammer/crypto/openssl/ssl/s23_srvr.c#3 (text+ko) ====

@@ -268,9 +268,6 @@
 	int n=0,j;
 	int type=0;
 	int v[2];
-#ifndef OPENSSL_NO_RSA
-	int use_sslv2_strong=0;
-#endif
 
 	if (s->state ==	SSL23_ST_SR_CLNT_HELLO_A)
 		{
@@ -519,9 +516,7 @@
 			}
 
 		s->state=SSL2_ST_GET_CLIENT_HELLO_A;
-		if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
-			use_sslv2_strong ||
-			(s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
+		if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
 			s->s2->ssl2_rollback=0;
 		else
 			/* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0

==== //depot/projects/hammer/etc/defaults/rc.conf#62 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.261 2005/10/02 18:59:01 yar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.262 2005/10/11 19:16:47 emax Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -309,6 +309,15 @@
 isdn_trace="NO"			# Enable the ISDN trace subsystem (or NO).
 isdn_traceflags="-f /var/tmp/isdntrace0"	# Flags for isdntrace
 
+### Bluetooth ###
+hcsecd_enable="NO"		# Enable hcsecd(8) (or NO)
+hcsecd_config="/etc/bluetooth/hcsecd.conf" # hcsecd(8) configuration file
+
+sdpd_enable="NO"		# Enable sdpd(8) (or NO)
+sdpd_control="/var/run/sdp"	# sdpd(8) control socket
+sdpd_group="nobody"		# set spdp(8) user/group to run as after
+sdpd_user="nobody"		# it initializes
+
 ### Miscellaneous network options: ###
 icmp_bmcastecho="NO"	# respond to broadcast ping packets
 

==== //depot/projects/hammer/etc/rc.firewall6#6 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh -
 ############
 # Setup system for IPv6 firewall service.
-# $FreeBSD: src/etc/rc.firewall6,v 1.15 2004/08/03 08:58:34 ume Exp $
+# $FreeBSD: src/etc/rc.firewall6,v 1.16 2005/10/05 07:00:42 ume Exp $
 
 # Suck in the configuration variables.
 if [ -z "${source_rc_confs_defined}" ]; then
@@ -188,6 +188,10 @@
 	${fw6cmd} add deny all from ${inet}/${iprefixlen} to any in via ${oif}
 	${fw6cmd} add deny all from ${onet}/${oprefixlen} to any in via ${iif}
 
+	# Stop unique local unicast address on the outside interface
+	${fw6cmd} add deny all from fc00::/7 to any via ${oif}
+	${fw6cmd} add deny all from any to fc00::/7 via ${oif}
+
 	# Stop site-local on the outside interface
 	${fw6cmd} add deny all from fec0::/10 to any via ${oif}
 	${fw6cmd} add deny all from any to fec0::/10 via ${oif}

==== //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.11 2005/10/01 06:35:58 tjr Exp $
+# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.12 2005/10/06 09:49:37 tjr Exp $
 
 CPIODIR= ${.CURDIR}/../../../contrib/cpio
 .PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc
@@ -57,6 +57,6 @@
 	ln -fs ${.ALLSRC} ${.TARGET}
 
 CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \
-	-DHAVE_MKFIFO -DHAVE_SETLOCALE
+	-DHAVE_MKFIFO -DHAVE_SETLOCALE -DHAVE_LSTAT
 
 .include <bsd.prog.mk>

==== //depot/projects/hammer/lib/csu/amd64/crt1.c#6 (text+ko) ====

@@ -86,15 +86,10 @@
 	atexit(_fini);
 #ifdef GCRT
 	monstartup(&eprol, &etext);
+__asm__("eprol:");
 #endif
 	_init();
 	exit( main(argc, argv, env) );
 }
 
-#ifdef GCRT
-__asm__(".text");
-__asm__("eprol:");
-__asm__(".previous");
-#endif
-
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.14 2004/08/15 16:18:51 dfr Exp $\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");

==== //depot/projects/hammer/lib/csu/i386-elf/crt1.c#6 (text+ko) ====

@@ -104,15 +104,10 @@
 	atexit(_fini);
 #ifdef GCRT
 	monstartup(&eprol, &etext);
+__asm__("eprol:");
 #endif
 	_init();
 	exit( main(argc, argv, env) );
 }
 
-#ifdef GCRT
-__asm__(".text");
-__asm__("eprol:");
-__asm__(".previous");
-#endif
-
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.14 2005/05/19 07:36:07 dfr Exp $\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");

==== //depot/projects/hammer/lib/libdevstat/devstat.c#9 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.28 2005/04/26 15:02:01 mux Exp $");
+__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29 2005/10/04 22:00:35 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -1582,7 +1582,7 @@
 static char *
 get_devstat_kvm(kvm_t *kd)
 {
-	int error, i, wp;
+	int i, wp;
 	long gen;
 	struct devstat *nds;
 	struct devstat ds;
@@ -1592,7 +1592,6 @@
 
 	if ((num_devs = devstat_getnumdevs(kd)) <= 0)
 		return(NULL);
-	error = 0;
 	if (KREADNL(kd, X_DEVICE_STATQ, dhead) == -1)
 		return(NULL);
 

==== //depot/projects/hammer/lib/libedit/editline.3#7 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$NetBSD: editline.3,v 1.48 2005/07/14 15:02:37 wiz Exp $
+.\"	$NetBSD: editline.3,v 1.49 2005/09/09 22:32:56 wiz Exp $
 .\"
 .\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,9 +33,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libedit/editline.3,v 1.25 2005/08/09 13:35:48 stefanf Exp $
+.\" $FreeBSD: src/lib/libedit/editline.3,v 1.26 2005/10/04 21:51:26 stefanf Exp $
 .\"
-.Dd July 14, 2005
+.Dd October 4, 2005
 .Os
 .Dt EDITLINE 3
 .Sh NAME
@@ -631,11 +631,11 @@
 Save the history list to
 .Fa file .
 .It Dv H_SETUNIQUE , Fa "int unique"
-Set if the adjacent identical event strings should not be entered into
-the history.
+Set flag that adjacent identical event strings should not be entered
+into the history.
 .It Dv H_GETUNIQUE
-Retrieve the current setting if if adjacent elements should be entered into
-the history.
+Retrieve the current setting if adjacent identical elements should
+be entered into the history.
 .It Dv H_DEL , Fa "int num"
 Delete the event numbered
 .Fa e .

==== //depot/projects/hammer/lib/libedit/el.c#3 (text+ko) ====

@@ -29,14 +29,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: el.c,v 1.40 2005/08/01 23:00:15 christos Exp $
+ *	$NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.12 2005/08/07 20:51:52 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.13 2005/10/04 21:45:42 stefanf Exp $");
 
 /*
  * el.c: EditLine interface functions
@@ -301,11 +301,11 @@
 	switch (op) {
 	case EL_PROMPT:
 	case EL_RPROMPT:
-		rv = prompt_get(el, (void *) &ret, op);
+		rv = prompt_get(el, (el_pfunc_t *) ret, op);
 		break;
 
 	case EL_EDITOR:
-		rv = map_get_editor(el, (void *) &ret);
+		rv = map_get_editor(el, (const char **)ret);
 		break;
 
 	case EL_SIGNAL:

==== //depot/projects/hammer/lib/libedit/makelist#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
-#	$NetBSD: makelist,v 1.9 2005/05/16 13:14:43 lukem Exp $
-# $FreeBSD: src/lib/libedit/makelist,v 1.9 2005/08/07 20:51:52 stefanf Exp $
+#	$NetBSD: makelist,v 1.10 2005/08/08 14:04:49 christos Exp $
+# $FreeBSD: src/lib/libedit/makelist,v 1.10 2005/10/04 21:59:29 stefanf Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -119,7 +119,6 @@
 	    }
 	}
 	END {
-	    printf("    { NULL, 0, NULL }\n");
 	    printf("};\n");
 	    printf("\nprotected const el_bindings_t* help__get()");
 	    printf("{ return el_func_help; }\n");

==== //depot/projects/hammer/lib/libedit/map.c#3 (text+ko) ====

@@ -29,14 +29,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: map.c,v 1.20 2004/08/13 12:10:39 mycroft Exp $
+ *	$NetBSD: map.c,v 1.22 2005/08/09 13:58:44 christos Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.11 2005/08/08 07:03:50 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.12 2005/10/04 21:59:29 stefanf Exp $");
 
 /*
  * map.c: Editor function definitions
@@ -913,11 +913,11 @@
 	el->el_map.vic = el_map_vi_command;
 	el->el_map.vii = el_map_vi_insert;
 	el->el_map.help = (el_bindings_t *) el_malloc(sizeof(el_bindings_t) *
-	    (EL_NUM_FCNS + 1));
+	    EL_NUM_FCNS);
 	if (el->el_map.help == NULL)
 		return (-1);
 	(void) memcpy(el->el_map.help, help__get(),
-	    sizeof(el_bindings_t) * (EL_NUM_FCNS + 1));
+	    sizeof(el_bindings_t) * EL_NUM_FCNS);
 	el->el_map.func = (el_func_t *)el_malloc(sizeof(el_func_t) *
 	    EL_NUM_FCNS);
 	if (el->el_map.func == NULL)
@@ -1123,11 +1123,12 @@
 map_print_key(EditLine *el, el_action_t *map, const char *in)
 {
 	char outbuf[EL_BUFSIZ];
-	el_bindings_t *bp;
+	el_bindings_t *bp, *ep;
 
 	if (in[0] == '\0' || in[1] == '\0') {
 		(void) key__decode_str(in, outbuf, "");
-		for (bp = el->el_map.help; bp->name != NULL; bp++)
+		ep = &el->el_map.help[el->el_map.nfunc];
+		for (bp = el->el_map.help; bp < ep; bp++)
 			if (bp->func == map[(unsigned char) *in]) {
 				(void) fprintf(el->el_outfile,
 				    "%s\t->\t%s\n", outbuf, bp->name);
@@ -1144,7 +1145,7 @@
 private void
 map_print_some_keys(EditLine *el, el_action_t *map, int first, int last)
 {
-	el_bindings_t *bp;
+	el_bindings_t *bp, *ep;
 	char firstbuf[2], lastbuf[2];
 	char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ];
 
@@ -1159,7 +1160,8 @@
 			    key__decode_str(firstbuf, unparsbuf, STRQQ));
 		return;
 	}
-	for (bp = el->el_map.help; bp->name != NULL; bp++) {
+	ep = &el->el_map.help[el->el_map.nfunc];
+	for (bp = el->el_map.help; bp < ep; bp++) {
 		if (bp->func == map[first]) {
 			if (first == last) {
 				(void) fprintf(el->el_outfile, "%-15s->  %s\n",
@@ -1242,7 +1244,7 @@
 	char outbuf[EL_BUFSIZ];
 	const char *in = NULL;
 	char *out = NULL;
-	el_bindings_t *bp;
+	el_bindings_t *bp, *ep;
 	int cmd;
 	int key;
 
@@ -1284,8 +1286,8 @@
 				return (0);
 
 			case 'l':
-				for (bp = el->el_map.help; bp->name != NULL;
-				    bp++)
+				ep = &el->el_map.help[el->el_map.nfunc];
+				for (bp = el->el_map.help; bp < ep; bp++)
 					(void) fprintf(el->el_outfile,
 					    "%s\n\t%s\n",
 					    bp->name, bp->description);
@@ -1386,7 +1388,7 @@
 map_addfunc(EditLine *el, const char *name, const char *help, el_func_t func)
 {
 	void *p;
-	int nf = el->el_map.nfunc + 2;
+	int nf = el->el_map.nfunc + 1;
 
 	if (name == NULL || help == NULL || func == NULL)
 		return (-1);
@@ -1405,7 +1407,6 @@
 	el->el_map.help[nf].name = name;
 	el->el_map.help[nf].func = nf;
 	el->el_map.help[nf].description = help;
-	el->el_map.help[++nf].name = NULL;
 	el->el_map.nfunc++;
 
 	return (0);

==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#18 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.23 2005/09/01 15:21:23 stefanf Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.24 2005/10/10 12:15:07 davidxu Exp $
  */
 
 #include <sys/types.h>
@@ -140,7 +140,7 @@
 
 	/* Initialise hooks in the thread structure: */
 	if (new_thread->attr.suspend == THR_CREATE_SUSPENDED)
-		new_thread->flags = THR_FLAGS_SUSPENDED;
+		new_thread->flags = THR_FLAGS_NEED_SUSPEND;
 	new_thread->state = PS_RUNNING;
 
 	/* Add the new thread. */

==== //depot/projects/hammer/lib/libutil/trimdomain.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.5 2003/10/18 10:04:16 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.6 2005/10/05 04:42:20 brooks Exp $");
 
 #include <sys/param.h>
 
@@ -75,18 +75,16 @@
 
 	s = fullhost;
 	end = s + hostsize + 1;
-	for (; (s = memchr(s, '.', (size_t)(end - s))) != NULL; s++) {
+	if ((s = memchr(s, '.', (size_t)(end - s))) != NULL) {
 		if (strncasecmp(s + 1, domain, dlen) == 0) {
 			if (s[dlen + 1] == '\0') {
 				/* Found -- lose the domain. */
 				*s = '\0';
-				break;
 			} else if (s[dlen + 1] == ':' &&
 			    isDISP(s + dlen + 2) &&
 			    (len = strlen(s + dlen + 1)) < (size_t)(end - s)) {
 				/* Found -- shuffle the DISPLAY back. */
 				memmove(s, s + dlen + 1, len + 1);
-				break;
 			}
 		}
 	}

==== //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#2 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.11 2005/10/10 20:02:02 bde Exp $";
 #endif
 
 /* __ieee754_rem_pio2f(x,y)
@@ -54,8 +54,23 @@
 0x73, 0xA8, 0xC9, 0x60, 0xE2, 0x7B, 0xC0, 0x8C, 0x6B,
 };
 
-/* This array is like the one in e_rem_pio2.c, but the numbers are
-   single precision and the last 8 bits are forced to 0.  */
+/*
+ * This array is like the one in e_rem_pio2.c, but the numbers are
+ * single precision and the last few bits (8 here) are ignored by
+ * masking them off in the float word instead of by omitting the low
+ * word.
+ * 
+ * Masking off 8 bits is not enough, but we defer further masking to
+ * runtime so that the mask is easy to change.  We now mask off 21
+ * bits, which is the smallest number that makes the "quick check no
+ * cancellation" detect all cancellations for cases that it is used.
+ * It doesn't detect all non-cancellations, especiallly for small
+ * multiples of pi/2, but then the non-quick code selects the best
+ * approximation of pi/2 to use.  The result is that arg reduction is
+ * always done with between 8 or 9 and 17 bits of extra precision in
+ * the medium-multiple case.  With only 8 bits masked of we had
+ * negative extra precision in some cases starting near +-13*pi/2.
+ */
 static const int32_t npio2_hw[] = {
 0x3fc90f00, 0x40490f00, 0x4096cb00, 0x40c90f00, 0x40fb5300, 0x4116cb00,
 0x412fed00, 0x41490f00, 0x41623100, 0x417b5300, 0x418a3a00, 0x4196cb00,
@@ -100,10 +115,10 @@
 	if(ix<0x4016cbe4) {  /* |x| < 3pi/4, special case with n=+-1 */
 	    if(hx>0) {
 		z = x - pio2_1;
-		if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */
+		if((ix&0xfffe0000)!=0x3fc80000) { /* 17+24 bit pi OK */
 		    y[0] = z - pio2_1t;
 		    y[1] = (z-y[0])-pio2_1t;
-		} else {		/* near pi/2, use 24+24+24 bit pi */
+		} else {		/* near pi/2, use 17+17+24 bit pi */
 		    z -= pio2_2;
 		    y[0] = z - pio2_2t;
 		    y[1] = (z-y[0])-pio2_2t;
@@ -111,10 +126,10 @@
 		return 1;
 	    } else {	/* negative x */
 		z = x + pio2_1;
-		if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */
+		if((ix&0xfffe0000)!=0x3fc80000) { /* 17+24 bit pi OK */
 		    y[0] = z + pio2_1t;
 		    y[1] = (z-y[0])+pio2_1t;
-		} else {		/* near pi/2, use 24+24+24 bit pi */
+		} else {		/* near pi/2, use 17+17+24 bit pi */
 		    z += pio2_2;
 		    y[0] = z + pio2_2t;
 		    y[1] = (z-y[0])+pio2_2t;
@@ -128,7 +143,7 @@
 	    fn = (float)n;
 	    r  = t-fn*pio2_1;
 	    w  = fn*pio2_1t;	/* 1st round good to 40 bit */
-	    if(n<32&&(ix&0xffffff00)!=npio2_hw[n-1]) {
+	    if(n<32&&(ix&0xffe00000)!=(npio2_hw[n-1]&0xffe00000)) {
 		y[0] = r-w;	/* quick check no cancellation */
 	    } else {
 	        u_int32_t high;

==== //depot/projects/hammer/lib/msun/src/k_cosf.c#2 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.8 2005/10/09 21:07:23 bde Exp $";
 #endif
 
 #include "math.h"
@@ -44,10 +44,21 @@
 	if(ix < 0x3e99999a) 			/* if |x| < 0.3 */
 	    return one - ((float)0.5*z - (z*r - x*y));
 	else {
+	    /*
+	     * qx is an approximation to x*x/2 such that 1-qx and x*x/2-qx
+	     * are both exact.  Its implementation is optimized for
+	     * efficiency in preference to accuracy.  We use x*x/2 ~ x/4 for
+	     * x near 0.5 and mask off just enough low bits (3) for both of
+	     * the above differences to be exact.  We use a constant for
+	     * x > 0.78125 to keep using the same algorithm as k_cos.c,
+	     * although this gives only a small improvement in accuracy, at
+	     * least here.  Using x*x/2 to approximate itself (masking off
+	     * 3 low bits again) would give better accuracy.
+	     */
 	    if(ix > 0x3f480000) {		/* x > 0.78125 */
 		qx = (float)0.28125;
 	    } else {
-	        SET_FLOAT_WORD(qx,ix-0x01000000);	/* x/4 */
+	        SET_FLOAT_WORD(qx,(ix-0x01000000)&0xfffffff8);
 	    }
 	    hz = (float)0.5*z-qx;
 	    a  = one-qx;

==== //depot/projects/hammer/lib/msun/src/k_rem_pio2f.c#3 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.7 2005/04/05 23:27:47 das Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.8 2005/10/11 07:56:05 bde Exp $";
 #endif
 
 #include "math.h"
@@ -169,6 +169,7 @@
 	    case 2:
 		fw = 0.0;
 		for (i=jz;i>=0;i--) fw += fq[i];
+		fw = *(volatile float *)&fw;	/* clip any extra precision */
 		y[0] = (ih==0)? fw: -fw;
 		fw = fq[0]-fw;
 		for (i=1;i<=jz;i++) fw += fq[i];

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#81 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.289 2005/09/18 16:22:20 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.290 2005/10/10 18:01:18 joel Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -691,6 +691,8 @@
 
     &hwlist.snd.maestro3;
 
+    &hwlist.snd.mss;
+
     &hwlist.snd.neomagic;
 
     &hwlist.snd.sbc;

==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#31 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.68 2005/09/18 16:22:20 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.69 2005/10/10 18:01:18 joel Exp $
 #
 
 #
@@ -119,6 +119,7 @@
 snd_ich	i386,amd64
 snd_maestro	i386,alpha,amd64
 snd_maestro3	i386,alpha,amd64
+snd_mss	i386
 snd_neomagic	i386,amd64
 snd_sbc	i386,alpha,amd64
 snd_solo	i386,amd64

==== //depot/projects/hammer/sbin/devd/devd.cc#14 (text+ko) ====

@@ -34,7 +34,7 @@
 //	  - devd.conf needs more details on the supported statements.
 
 #include <sys/cdefs.h>

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list