Date: Tue, 15 Jun 2004 14:10:25 GMT From: Doug Rabson <dfr@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55025 for review Message-ID: <200406151410.i5FEAPBp073749@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55025 Change 55025 by dfr@dfr_home on 2004/06/15 14:09:56 IFC. Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#9 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#6 integrate .. //depot/projects/kse/include/Makefile#6 integrate .. //depot/projects/kse/lib/libc/gen/fts.c#5 integrate .. //depot/projects/kse/lib/libc/gmon/moncontrol.3#3 integrate .. //depot/projects/kse/lib/libc/net/inet.3#4 integrate .. //depot/projects/kse/lib/libc/stdio/fvwrite.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/local.h#8 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/kse/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/wbuf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/kse/lib/libc/stdtime/asctime.c#3 integrate .. //depot/projects/kse/lib/libc/stdtime/difftime.c#3 integrate .. //depot/projects/kse/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/kse/lib/libc/stdtime/private.h#2 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/kse/lib/libc/sys/getrlimit.2#4 integrate .. //depot/projects/kse/lib/libc/sys/read.2#3 integrate .. //depot/projects/kse/lib/libc/sys/sigaction.2#5 integrate .. //depot/projects/kse/lib/libkvm/kvm.c#9 integrate .. //depot/projects/kse/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/kse/lib/libpthread/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#47 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#38 integrate .. //depot/projects/kse/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/kse/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/kse/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/kse/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/kse/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/kse/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/kse/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/kse/sys/amd64/include/asm.h#3 integrate .. //depot/projects/kse/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/kse/sys/amd64/include/param.h#2 integrate .. //depot/projects/kse/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/kse/sys/amd64/include/profile.h#4 integrate .. //depot/projects/kse/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/kse/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/kse/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#21 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/kse/sys/compat/linux/linux_uid16.c#11 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#14 integrate .. //depot/projects/kse/sys/conf/NOTES#22 integrate .. //depot/projects/kse/sys/conf/files#56 integrate .. //depot/projects/kse/sys/conf/files.alpha#20 integrate .. //depot/projects/kse/sys/conf/files.sparc64#23 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/kse/sys/conf/kmod.mk#16 integrate .. //depot/projects/kse/sys/conf/options#31 integrate .. //depot/projects/kse/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/kse/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/kse/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/kse/sys/crypto/des/des_ecb.c#3 integrate .. //depot/projects/kse/sys/crypto/des/des_enc.c#2 integrate .. //depot/projects/kse/sys/crypto/des/des_setkey.c#3 integrate .. //depot/projects/kse/sys/dev/aac/aac_debug.c#10 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_acad.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_button.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cmbat.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_lid.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#13 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_powerres.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_resource.c#13 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#25 integrate .. //depot/projects/kse/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/kse/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#29 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/kse/sys/dev/awi/awi.c#10 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/kse/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_mem.c#6 integrate .. //depot/projects/kse/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/kse/sys/dev/cy/cy.c#2 integrate .. //depot/projects/kse/sys/dev/digi/digi.c#14 integrate .. //depot/projects/kse/sys/dev/drm/drm.h#3 integrate .. //depot/projects/kse/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/kse/sys/dev/drm/drm_drv.h#6 integrate .. //depot/projects/kse/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#7 integrate .. //depot/projects/kse/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/kse/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/kse/sys/dev/drm/mga.h#3 integrate .. //depot/projects/kse/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/kse/sys/dev/drm/r128.h#3 integrate .. //depot/projects/kse/sys/dev/drm/r128_drm.h#3 integrate .. //depot/projects/kse/sys/dev/drm/r128_state.c#4 integrate .. //depot/projects/kse/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/kse/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/kse/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/kse/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/kse/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/kse/sys/dev/drm/sis.h#2 integrate .. //depot/projects/kse/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/kse/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/kse/sys/dev/drm/tdfx.h#3 integrate .. //depot/projects/kse/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/kse/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/kse/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/kse/sys/dev/eisa/eisaconf.h#4 integrate .. //depot/projects/kse/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/kse/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/kse/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/kse/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/kse/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/kse/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/kse/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/kse/sys/dev/fb/vga.c#10 integrate .. //depot/projects/kse/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/kse/sys/dev/firewire/if_fwip.c#1 branch .. //depot/projects/kse/sys/dev/firewire/if_fwipvar.h#1 branch .. //depot/projects/kse/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/kse/sys/dev/hme/if_hme.c#9 integrate .. //depot/projects/kse/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/kse/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/kse/sys/dev/kbd/atkbd.c#5 integrate .. //depot/projects/kse/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/kse/sys/dev/my/if_my.c#7 integrate .. //depot/projects/kse/sys/dev/nge/if_nge.c#15 integrate .. //depot/projects/kse/sys/dev/ofw/ofw_console.c#10 integrate .. //depot/projects/kse/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/kse/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/kse/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/kse/sys/dev/pdq/pdq_freebsd.h#4 integrate .. //depot/projects/kse/sys/dev/re/if_re.c#3 integrate .. //depot/projects/kse/sys/dev/rp/rp.c#9 integrate .. //depot/projects/kse/sys/dev/sab/sab.c#5 integrate .. //depot/projects/kse/sys/dev/si/si.c#8 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#22 integrate .. //depot/projects/kse/sys/dev/sio/sio_pci.c#8 integrate .. //depot/projects/kse/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb16.c#10 integrate .. //depot/projects/kse/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/kse/sys/dev/sx/sx.c#2 integrate .. //depot/projects/kse/sys/dev/twe/twe.c#7 integrate .. //depot/projects/kse/sys/dev/twe/twe_freebsd.c#10 integrate .. //depot/projects/kse/sys/dev/twe/twevar.h#6 integrate .. //depot/projects/kse/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/kse/sys/dev/usb/if_aue.c#16 integrate .. //depot/projects/kse/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/kse/sys/dev/usb/if_cue.c#7 integrate .. //depot/projects/kse/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/kse/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/kse/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/kse/sys/dev/usb/uhub.c#13 integrate .. //depot/projects/kse/sys/dev/wi/if_wi.c#28 integrate .. //depot/projects/kse/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/kse/sys/dev/xe/if_xe.c#7 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#21 integrate .. //depot/projects/kse/sys/geom/geom_io.c#8 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/projects/kse/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/projects/kse/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_toshiba.c#3 integrate .. //depot/projects/kse/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/kse/sys/i386/bios/mca_machdep.c#3 integrate .. //depot/projects/kse/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/kse/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/kse/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#43 integrate .. //depot/projects/kse/sys/i386/i386/bios.c#15 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#63 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#48 integrate .. //depot/projects/kse/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/kse/sys/i386/include/md_var.h#16 integrate .. //depot/projects/kse/sys/i386/include/pc/bios.h#6 integrate .. //depot/projects/kse/sys/i386/include/pmap.h#14 integrate .. //depot/projects/kse/sys/i386/isa/vesa.c#7 integrate .. //depot/projects/kse/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ipr.c#8 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#42 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#35 integrate .. //depot/projects/kse/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#42 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#67 integrate .. //depot/projects/kse/sys/kern/kern_kse.c#2 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#92 integrate .. //depot/projects/kse/sys/kern/kern_prot.c#35 integrate .. //depot/projects/kse/sys/kern/kern_resource.c#28 integrate .. //depot/projects/kse/sys/kern/kern_sema.c#5 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#73 integrate .. //depot/projects/kse/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#116 integrate .. //depot/projects/kse/sys/kern/kern_xxx.c#9 integrate .. //depot/projects/kse/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#35 integrate .. //depot/projects/kse/sys/kern/sys_socket.c#13 integrate .. //depot/projects/kse/sys/kern/tty.c#35 integrate .. //depot/projects/kse/sys/kern/tty_compat.c#6 integrate .. //depot/projects/kse/sys/kern/tty_conf.c#6 integrate .. //depot/projects/kse/sys/kern/tty_pty.c#15 integrate .. //depot/projects/kse/sys/kern/uipc_mbuf.c#14 integrate .. //depot/projects/kse/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/kse/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/kse/sys/kern/uipc_usrreq.c#25 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#48 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#41 integrate .. //depot/projects/kse/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/kse/sys/modules/em/Makefile#4 integrate .. //depot/projects/kse/sys/modules/esp/Makefile#1 branch .. //depot/projects/kse/sys/modules/geom/geom_vinum/Makefile#1 branch .. //depot/projects/kse/sys/modules/ipfilter/Makefile#5 integrate .. //depot/projects/kse/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/kse/sys/modules/vx/Makefile#2 integrate .. //depot/projects/kse/sys/net/bpf.c#17 integrate .. //depot/projects/kse/sys/net/firewire.h#1 branch .. //depot/projects/kse/sys/net/if.c#24 integrate .. //depot/projects/kse/sys/net/if_arp.h#7 integrate .. //depot/projects/kse/sys/net/if_fwsubr.c#1 branch .. //depot/projects/kse/sys/net/if_ppp.c#15 integrate .. //depot/projects/kse/sys/net/if_sl.c#15 integrate .. //depot/projects/kse/sys/net/if_spppsubr.c#13 integrate .. //depot/projects/kse/sys/net/if_var.h#18 integrate .. //depot/projects/kse/sys/net/netisr.h#8 integrate .. //depot/projects/kse/sys/net/raw_cb.c#7 integrate .. //depot/projects/kse/sys/net/raw_cb.h#7 integrate .. //depot/projects/kse/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/kse/sys/net/rtsock.c#23 integrate .. //depot/projects/kse/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/kse/sys/netatalk/ddp_input.c#8 integrate .. //depot/projects/kse/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/kse/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/kse/sys/netatm/atm_aal5.c#9 integrate .. //depot/projects/kse/sys/netatm/atm_ioctl.h#5 integrate .. //depot/projects/kse/sys/netatm/atm_socket.c#8 integrate .. //depot/projects/kse/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/kse/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/kse/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/kse/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/kse/sys/netgraph/ng_ksocket.c#21 integrate .. //depot/projects/kse/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/kse/sys/netgraph/ng_rfc1490.c#6 integrate .. //depot/projects/kse/sys/netgraph/ng_rfc1490.h#3 integrate .. //depot/projects/kse/sys/netinet/accf_http.c#7 integrate .. //depot/projects/kse/sys/netinet/if_ether.c#17 integrate .. //depot/projects/kse/sys/netinet/igmp.c#8 integrate .. //depot/projects/kse/sys/netinet/in.h#14 integrate .. //depot/projects/kse/sys/netinet/in_pcb.c#24 integrate .. //depot/projects/kse/sys/netinet/ip_divert.c#19 integrate .. //depot/projects/kse/sys/netinet/ip_fw.h#14 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/kse/sys/netinet/ip_input.c#29 integrate .. //depot/projects/kse/sys/netinet/ip_output.c#32 integrate .. //depot/projects/kse/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/kse/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/kse/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/kse/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/kse/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/kse/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/kse/sys/netipx/ipx_pcb.c#9 integrate .. //depot/projects/kse/sys/netipx/ipx_usrreq.c#10 integrate .. //depot/projects/kse/sys/netipx/spx_usrreq.c#11 integrate .. //depot/projects/kse/sys/netnatm/natm.c#9 integrate .. //depot/projects/kse/sys/netsmb/smb_trantcp.c#11 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#37 integrate .. //depot/projects/kse/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/kse/sys/pc98/pc98/sio.c#22 integrate .. //depot/projects/kse/sys/pci/if_dc.c#24 integrate .. //depot/projects/kse/sys/pci/if_de.c#7 integrate .. //depot/projects/kse/sys/pci/if_mn.c#5 integrate .. //depot/projects/kse/sys/pci/if_pcn.c#10 integrate .. //depot/projects/kse/sys/pci/if_rl.c#18 integrate .. //depot/projects/kse/sys/pci/if_sf.c#13 integrate .. //depot/projects/kse/sys/pci/if_sis.c#18 integrate .. //depot/projects/kse/sys/pci/if_sk.c#11 integrate .. //depot/projects/kse/sys/pci/if_ste.c#16 integrate .. //depot/projects/kse/sys/pci/if_vr.c#11 integrate .. //depot/projects/kse/sys/pci/if_wb.c#9 integrate .. //depot/projects/kse/sys/pci/if_xl.c#15 integrate .. //depot/projects/kse/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/kse/sys/sparc64/sbus/lsi64854.c#1 branch .. //depot/projects/kse/sys/sparc64/sbus/lsi64854reg.h#1 branch .. //depot/projects/kse/sys/sparc64/sbus/lsi64854var.h#1 branch .. //depot/projects/kse/sys/sys/_types.h#8 integrate .. //depot/projects/kse/sys/sys/gmon.h#5 integrate .. //depot/projects/kse/sys/sys/ioctl.h#5 integrate .. //depot/projects/kse/sys/sys/linedisc.h#2 integrate .. //depot/projects/kse/sys/sys/mbuf.h#18 integrate .. //depot/projects/kse/sys/sys/param.h#29 integrate .. //depot/projects/kse/sys/sys/resource.h#9 integrate .. //depot/projects/kse/sys/sys/signal.h#10 integrate .. //depot/projects/kse/sys/sys/socketvar.h#28 integrate .. //depot/projects/kse/sys/sys/tty.h#11 integrate .. //depot/projects/kse/sys/sys/types.h#23 integrate .. //depot/projects/kse/sys/sys/vmmeter.h#5 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#17 integrate .. //depot/projects/kse/sys/vm/uma_core.c#17 integrate .. //depot/projects/kse/sys/vm/vm_contig.c#12 integrate .. //depot/projects/kse/sys/vm/vm_mmap.c#24 integrate .. //depot/projects/kse/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/kse/tools/regression/lib/msun/Makefile#1 branch .. //depot/projects/kse/tools/regression/lib/msun/test-fenv.c#1 branch Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.79 2004/03/17 07:40:42 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.80 2004/06/11 16:09:38 obrien Exp $ .include "../Makefile.inc0" @@ -45,7 +45,7 @@ scm-exp.c scm-lang.c scm-valprint.c \ coffread.c dbxread.c dwarfread.c dwarf2read.c elfread.c \ solib.c solib-svr4.c solib-legacy.c -XSRCS+= freebsd-uthread.c kvm-fbsd.c solib-fbsd-kld.c +XSRCS+= freebsd-uthread.c kvm-fbsd.c kvm-fbsd-machine.h solib-fbsd-kld.c SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h .include "${.CURDIR}/Makefile.${TARGET_ARCH}" @@ -73,7 +73,7 @@ LDADD+= ${RELTOP}/libiberty/libiberty.a LDADD+= -lreadline -ltermcap -CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h +CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h kvm-fbsd-machine.h # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine @@ -127,6 +127,9 @@ ln -sf ${GDBDIR}/gdb/config/${GDB_CPU}/${H}.h ${.TARGET} .endfor +kvm-fbsd-machine.h: + ln -sf ${.CURDIR}/kvm-fbsd-${TARGET_ARCH}.h ${.TARGET} + GDB_VERSION= "5.2.1 (FreeBSD)" gdbversion.c: Makefile @echo '#include "version.h"' > ${.TARGET} ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#6 (text+ko) ==== @@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.48 2004/05/10 17:45:51 obrien Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.49 2004/06/11 16:09:38 obrien Exp $"); /* * This works like "remote" but, you use it like this: @@ -33,31 +34,27 @@ */ #include <sys/param.h> -#include <sys/time.h> -#include <sys/proc.h> #include <sys/user.h> -#include <errno.h> -#include <signal.h> +#include <ctype.h> #include <fcntl.h> #include <kvm.h> #include <sys/sysctl.h> #include <paths.h> -#include <readline/tilde.h> -#include <machine/frame.h> #include "defs.h" +#include <readline/tilde.h> #include "gdb_string.h" #include "frame.h" /* required by inferior.h */ #include "inferior.h" -#include "symtab.h" #include "symfile.h" #include "objfiles.h" #include "command.h" #include "bfd.h" -#include "target.h" #include "gdbcore.h" #include "solist.h" +#include "kvm-fbsd-machine.h" + static void kcore_files_info (struct target_ops *); @@ -68,10 +65,6 @@ get_kcore_registers (int); static int -xfer_mem (CORE_ADDR, char *, int, int, struct mem_attrib *, - struct target_ops *); - -static int xfer_umem (CORE_ADDR, char *, int, int); #ifdef SOLIB_ADD @@ -116,7 +109,7 @@ #define KERNOFF (ksym_kernbase ()) #define INKERNEL(x) ((x) >= KERNOFF) -CORE_ADDR +static CORE_ADDR ksym_lookup(const char *name) { struct minimal_symbol *sym; @@ -190,8 +183,6 @@ static int set_context (CORE_ADDR addr) { - CORE_ADDR procaddr = 0; - if (kvread (addr, &cur_pcb)) error ("cannot read pcb at %#x", addr); @@ -349,253 +340,6 @@ printf_filtered ("No kernel core file now.\n"); } -#ifdef __alpha__ - -#include "alpha/tm-alpha.h" -#ifndef S0_REGNUM -#define S0_REGNUM (T7_REGNUM+1) -#endif - -fetch_kcore_registers (struct pcb *pcbp) -{ - - /* First clear out any garbage. */ - memset (registers, '\0', REGISTER_BYTES); - - /* SP */ - *(long *) ®isters[REGISTER_BYTE (SP_REGNUM)] = - pcbp->pcb_hw.apcb_ksp; - - /* S0 through S6 */ - memcpy (®isters[REGISTER_BYTE (S0_REGNUM)], - &pcbp->pcb_context[0], 7 * sizeof (long)); - - /* PC */ - *(long *) ®isters[REGISTER_BYTE (PC_REGNUM)] = - pcbp->pcb_context[7]; - - registers_fetched (); -} - - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR this_saved_pc; - - this_saved_pc = alpha_frame_saved_pc (fi); - - sym = lookup_minimal_symbol_by_pc (this_saved_pc); - - if (sym != NULL && - (strcmp (SYMBOL_NAME (sym), "XentArith") == 0 || - strcmp (SYMBOL_NAME (sym), "XentIF") == 0 || - strcmp (SYMBOL_NAME (sym), "XentInt") == 0 || - strcmp (SYMBOL_NAME (sym), "XentMM") == 0 || - strcmp (SYMBOL_NAME (sym), "XentSys") == 0 || - strcmp (SYMBOL_NAME (sym), "XentUna") == 0 || - strcmp (SYMBOL_NAME (sym), "XentRestart") == 0)) - { - return (read_memory_integer (fi->frame + 32 * 8, 8)); - } - else - { - return (this_saved_pc); - } -} - -#endif /* __alpha__ */ - -#ifdef __i386__ - -static CORE_ADDR -ksym_maxuseraddr (void) -{ - static CORE_ADDR maxuseraddr; - struct minimal_symbol *sym; - - if (maxuseraddr == 0) - { - sym = lookup_minimal_symbol ("PTmap", NULL, NULL); - if (sym == NULL) { - maxuseraddr = VM_MAXUSER_ADDRESS; - } else { - maxuseraddr = SYMBOL_VALUE_ADDRESS (sym); - } - } - return maxuseraddr; -} - - -/* Symbol names of kernel entry points. Use special frames. */ -#define KSYM_TRAP "calltrap" -#define KSYM_INTR "Xintr" -#define KSYM_FASTINTR "Xfastintr" -#define KSYM_OLDSYSCALL "Xlcall_syscall" -#define KSYM_SYSCALL "Xint0x80_syscall" - -/* The following is FreeBSD-specific hackery to decode special frames - and elide the assembly-language stub. This could be made faster by - defining a frame_type field in the machine-dependent frame information, - but we don't think that's too important right now. */ -enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall }; - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR this_saved_pc; - enum frametype frametype; - - this_saved_pc = read_memory_integer (fi->frame + 4, 4); - sym = lookup_minimal_symbol_by_pc (this_saved_pc); - frametype = tf_normal; - if (sym != NULL) - { - if (strcmp (SYMBOL_NAME (sym), KSYM_TRAP) == 0) - frametype = tf_trap; - else - if (strncmp (SYMBOL_NAME (sym), KSYM_INTR, - strlen (KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym), - KSYM_FASTINTR, strlen (KSYM_FASTINTR)) == 0) - frametype = tf_interrupt; - else - if (strcmp (SYMBOL_NAME (sym), KSYM_SYSCALL) == 0 || - strcmp (SYMBOL_NAME (sym), KSYM_OLDSYSCALL) == 0) - frametype = tf_syscall; - } - - switch (frametype) - { - case tf_normal: - return (this_saved_pc); -#define oEIP offsetof (struct trapframe, tf_eip) - - case tf_trap: - return (read_memory_integer (fi->frame + 8 + oEIP, 4)); - - case tf_interrupt: - return (read_memory_integer (fi->frame + 12 + oEIP, 4)); - - case tf_syscall: - return (read_memory_integer (fi->frame + 8 + oEIP, 4)); -#undef oEIP - } -} - -static int -fetch_kcore_registers (struct pcb *pcb) -{ - int i; - int noreg; - - /* Get the register values out of the sys pcb and store them where - `read_register' will find them. */ - /* - * XXX many registers aren't available. - * XXX for the non-core case, the registers are stale - they are for - * the last context switch to the debugger. - * XXX gcc's register numbers aren't all #defined in tm-i386.h. - */ - noreg = 0; - for (i = 0; i < 3; ++i) /* eax,ecx,edx */ - supply_register (i, (char *)&noreg); - - supply_register (3, (char *) &pcb->pcb_ebx); - supply_register (SP_REGNUM, (char *) &pcb->pcb_esp); - supply_register (FP_REGNUM, (char *) &pcb->pcb_ebp); - supply_register (6, (char *) &pcb->pcb_esi); - supply_register (7, (char *) &pcb->pcb_edi); - supply_register (PC_REGNUM, (char *) &pcb->pcb_eip); - - for (i = 9; i < 14; ++i) /* eflags, cs, ss, ds, es, fs */ - supply_register (i, (char *) &noreg); - supply_register (15, (char *) &pcb->pcb_gs); - - /* XXX 80387 registers? */ -} - -#endif /* __i386__ */ - -#ifdef __sparc64__ - -#define SPARC_INTREG_SIZE 8 - -static void -fetch_kcore_registers (struct pcb *pcbp) -{ - static struct frame top; - CORE_ADDR f_addr; - int i; - - /* Get the register values out of the sys pcb and store them where - `read_register' will find them. */ - /* - * XXX many registers aren't available. - * XXX for the non-core case, the registers are stale - they are for - * the last context switch to the debugger. - * XXX do something with the floating-point registers? - */ - supply_register (SP_REGNUM, (char *)&pcbp->pcb_ufp); - supply_register (PC_REGNUM, (char *)&pcbp->pcb_pc); - f_addr = extract_address (&pcbp->pcb_ufp, SPARC_INTREG_SIZE); - /* Load the previous frame by hand (XXX) and supply it. */ - read_memory (f_addr + SPOFF, (char *)&top, sizeof (top)); - for (i = 0; i < 8; i++) - supply_register (i + L0_REGNUM, (char *)&top.fr_local[i]); - for (i = 0; i < 8; i++) - supply_register (i + I0_REGNUM, (char *)&top.fr_in[i]); -} - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR frame, pc_addr, pc; - char *buf; - - buf = alloca (MAX_REGISTER_RAW_SIZE); - /* XXX: duplicates fi->extra_info->bottom. */ - frame = (fi->next != NULL) ? fi->next->frame : read_sp (); - pc_addr = frame + offsetof (struct frame, fr_in[7]); - -#define READ_PC(pc, a, b) do { \ - read_memory (a, b, SPARC_INTREG_SIZE); \ - pc = extract_address (b, SPARC_INTREG_SIZE); \ -} while (0) - - READ_PC (pc, pc_addr, buf); - - sym = lookup_minimal_symbol_by_pc (pc); - if (sym != NULL) - { - if (strncmp (SYMBOL_NAME (sym), "tl0_", 4) == 0 || - strcmp (SYMBOL_NAME (sym), "btext") == 0 || - strcmp (SYMBOL_NAME (sym), "mp_startup") == 0 || - strcmp (SYMBOL_NAME (sym), "fork_trampoline") == 0) - { - /* - * Ugly kluge: user space addresses aren't separated from kernel - * ones by range; if encountering a trap from user space, just - * return a 0 to stop the trace. - * Do the same for entry points of kernel processes to avoid - * printing garbage. - */ - pc = 0; - } - if (strncmp (SYMBOL_NAME (sym), "tl1_", 4) == 0) - { - pc_addr = fi->frame + sizeof (struct frame) + - offsetof (struct trapframe, tf_tpc); - READ_PC (pc, pc_addr, buf); - } - } - return (pc); -} - -#endif /* __sparc64__ */ - /* Get the registers out of a core file. This is the machine- independent part. Fetch_core_registers is the machine-dependent part, typically implemented in the xm-file for each architecture. */ @@ -623,16 +367,7 @@ printf_filtered ("\t`%s'\n", core_file); } -/* If mourn is being called in all the right places, this could be say - `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ - static int -ignore (CORE_ADDR addr, char *contents) -{ - return 0; -} - -static int xfer_kmem (CORE_ADDR memaddr, char *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { @@ -651,7 +386,7 @@ n = kvm_read (core_kd, memaddr, myaddr, len) ; if (n < 0) { fprintf_unfiltered (gdb_stderr, "can not access 0x%x, %s\n", - memaddr, kvm_geterr (core_kd)); + (unsigned)memaddr, kvm_geterr (core_kd)); n = 0; } ==== //depot/projects/kse/include/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.213 2004/05/20 10:29:26 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.214 2004/06/13 17:29:05 mlaier Exp $ # # Doing a "make install" builds /usr/include. @@ -111,6 +111,9 @@ cd ${.CURDIR}/../sys/dev/bktr; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \ ${DESTDIR}${INCLUDEDIR}/dev/bktr + cd ${.CURDIR}/../sys/contrib/altq/altq; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/altq cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet @@ -149,6 +152,11 @@ ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor + cd ${.CURDIR}/../sys/contrib/altq/altq; \ + for h in *.h; do \ + ln -fs ../../../sys/contrib/altq/altq/$$h \ + ${DESTDIR}${INCLUDEDIR}/altq; \ + done cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ for h in *.h; do \ ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \ ==== //depot/projects/kse/lib/libc/gen/fts.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.26 2004/05/13 15:59:38 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $"); #include "namespace.h" #include <sys/param.h> @@ -710,8 +710,6 @@ cur->fts_flags |= FTS_DONTCHDIR; descend = 0; cderrno = errno; - (void)closedir(dirp); - dirp = NULL; } else descend = 1; } else ==== //depot/projects/kse/lib/libc/gmon/moncontrol.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)moncontrol.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.14 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.15 2004/06/14 18:41:24 bms Exp $ .\" -.Dd June 4, 1993 +.Dd June 14, 2004 .Dt MONCONTROL 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libc .Sh SYNOPSIS .In sys/types.h +.In sys/gmon.h .Ft int .Fn moncontrol "int mode" .Ft int ==== //depot/projects/kse/lib/libc/net/inet.3#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.25 2002/09/06 11:23:49 tjr Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.27 2004/06/14 14:24:18 bms Exp $ .\" -.Dd June 17, 1996 +.Dd June 14, 2004 .Dt INET 3 .Os .Sh NAME @@ -119,10 +119,17 @@ .Pp The function .Fn inet_ntop -converts an address from network format (usually a +converts an address +.Fa *src +from network format +(usually a .Ft struct in_addr or some other binary form, in network byte order) to presentation format (suitable for external display purposes). +The +.Fa size +argument specifies the size, in bytes, of the buffer +.Fa *dst . It returns NULL if a system error occurs (in which case, .Va errno will have been set), or it returns a pointer to the destination string. @@ -226,6 +233,18 @@ and .Fn inet_network for malformed requests. +.Sh ERRORS +The +.Fn inet_ntop +call fails if: +.Bl -tag -width Er +.It Bq Er ENOSPC +.Fa size +was not large enough to store the presentation form of the address. +.It Bq Er EAFNOSUPPORT +.Fa *src +was not an AF_INET or AF_INET6 family address. +.El .Sh SEE ALSO .Xr addr2ascii 3 , .Xr byteorder 3 , ==== //depot/projects/kse/lib/libc/stdio/fvwrite.c#3 (text+ko) ==== @@ -38,9 +38,8 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.16 2004/03/02 19:43:51 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.17 2004/06/08 05:45:48 das Exp $"); -#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -68,10 +67,8 @@ if ((len = uio->uio_resid) == 0) return (0); /* make sure we can write */ - if (cantwrite(fp)) { - errno = EBADF; + if (prepwrite(fp) != 0) return (EOF); - } #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define COPY(n) (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n)) ==== //depot/projects/kse/lib/libc/stdio/local.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.24 2004/05/22 15:19:41 tjr Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $ */ #include <sys/types.h> /* for off_t */ @@ -93,9 +93,10 @@ }; /* - * Return true iff the given FILE cannot be written now. + * Prepare the given FILE for writing, and return 0 iff it + * can be written now. Otherwise, return EOF and set errno. */ -#define cantwrite(fp) \ +#define prepwrite(fp) \ ((((fp)->_flags & __SWR) == 0 || \ ((fp)->_bf._base == NULL && ((fp)->_flags & __SSTR) == 0)) && \ __swsetup(fp)) ==== //depot/projects/kse/lib/libc/stdio/vfprintf.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.65 2004/05/02 10:55:05 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.67 2004/06/08 12:03:48 stefanf Exp $"); /* * Actual printf innards. @@ -642,7 +642,7 @@ decimal_point = localeconv()->decimal_point; #endif /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ - if (cantwrite(fp)) + if (prepwrite(fp) != 0) return (EOF); /* optimise fprintf(stderr) (and other unbuffered Unix files) */ @@ -1273,7 +1273,7 @@ */ #define ADDTYPE(type) \ ((nextarg >= tablesize) ? \ - __grow_type_table(nextarg, &typetable, &tablesize) : 0, \ + __grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \ (nextarg > tablemax) ? tablemax = nextarg : 0, \ typetable[nextarg++] = type) ==== //depot/projects/kse/lib/libc/stdio/vfwprintf.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.20 2004/05/02 20:09:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.22 2004/06/08 12:03:48 stefanf Exp $"); /* * Actual wprintf innards. @@ -648,7 +648,7 @@ #endif convbuf = NULL; /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */ - if (cantwrite(fp)) + if (prepwrite(fp) != 0) return (EOF); /* optimise fprintf(stderr) (and other unbuffered Unix files) */ @@ -1268,7 +1268,7 @@ */ #define ADDTYPE(type) \ ((nextarg >= tablesize) ? \ - __grow_type_table(nextarg, &typetable, &tablesize) : 0, \ + __grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \ (nextarg > tablemax) ? tablemax = nextarg : 0, \ typetable[nextarg++] = type) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406151410.i5FEAPBp073749>