Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 May 2003 15:23:29 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 32234 for review
Message-ID:  <200305312223.h4VMNTdo047417@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32234

Change 32234 by peter@peter_hammer on 2003/05/31 15:23:21

	IFC @32232

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#18 integrate
.. //depot/projects/hammer/lib/Makefile#15 integrate
.. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/ia64/gen/makecontext.c#1 branch
.. //depot/projects/hammer/lib/libc/stdlib/random.3#2 integrate
.. //depot/projects/hammer/share/man/man8/MAKEDEV.8#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#4 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#9 integrate
.. //depot/projects/hammer/sys/cam/cam.c#2 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#4 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#3 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_socket.h#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#4 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#5 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#8 integrate
.. //depot/projects/hammer/sys/ddb/db_break.c#3 integrate
.. //depot/projects/hammer/sys/ddb/db_input.c#4 integrate
.. //depot/projects/hammer/sys/dev/amd/amd.c#4 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#15 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#5 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt.c#7 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#4 integrate
.. //depot/projects/hammer/sys/dev/ccd/ccd.c#7 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#8 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#5 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#9 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#2 integrate
.. //depot/projects/hammer/sys/dev/isp/isp.c#6 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_target.c#4 integrate
.. //depot/projects/hammer/sys/dev/mii/bmtphy.c#4 integrate
.. //depot/projects/hammer/sys/dev/mii/dcphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/mii/lxtphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/mii/mii_physubr.c#3 integrate
.. //depot/projects/hammer/sys/dev/mii/mlphy.c#3 integrate
.. //depot/projects/hammer/sys/dev/mii/nsgphy.c#6 integrate
.. //depot/projects/hammer/sys/dev/mii/pnphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/musycc/musycc.c#5 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#13 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/streams/streams.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/fade/fade_saver.c#2 integrate
.. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/trm/trm.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/if_cue.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#3 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xe.c#5 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#9 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#5 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde.c#8 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#8 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#8 integrate
.. //depot/projects/hammer/sys/geom/geom_aes.c#11 integrate
.. //depot/projects/hammer/sys/geom/geom_apple.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom_bsd.c#18 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#16 integrate
.. //depot/projects/hammer/sys/geom/geom_gpt.c#14 integrate
.. //depot/projects/hammer/sys/geom/geom_mbr.c#13 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98.c#15 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.h#8 integrate
.. //depot/projects/hammer/sys/geom/geom_sunlabel.c#13 integrate
.. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate
.. //depot/projects/hammer/sys/i386/i386/bios.c#6 integrate
.. //depot/projects/hammer/sys/i386/i386/db_trace.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/i386-gdbstub.c#3 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/math_emulate.c#2 integrate
.. //depot/projects/hammer/sys/i386/i386/nexus.c#5 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#8 integrate
.. //depot/projects/hammer/sys/i386/isa/gpib.c#4 integrate
.. //depot/projects/hammer/sys/i386/isa/if_cx.c#4 integrate
.. //depot/projects/hammer/sys/i386/isa/wt.c#3 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_bus.c#9 integrate
.. //depot/projects/hammer/sys/i4b/layer2/i4b_l2fsm.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer3/i4b_l3fsm.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/syscall.s#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#7 integrate
.. //depot/projects/hammer/sys/ia64/include/_regset.h#2 integrate
.. //depot/projects/hammer/sys/isa/fd.c#7 integrate
.. //depot/projects/hammer/sys/isa/pnp.c#4 integrate
.. //depot/projects/hammer/sys/isa/ppc.c#4 integrate
.. //depot/projects/hammer/sys/isa/psm.c#6 integrate
.. //depot/projects/hammer/sys/isa/vga_isa.c#6 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_lookup.c#2 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#26 integrate
.. //depot/projects/hammer/sys/kern/subr_prf.c#10 integrate
.. //depot/projects/hammer/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#13 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#19 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/hammer/sys/net/if_atmsubr.c#8 integrate
.. //depot/projects/hammer/sys/net/if_ef.c#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#4 integrate
.. //depot/projects/hammer/sys/pci/alpm.c#3 integrate
.. //depot/projects/hammer/sys/pci/if_de.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_devar.h#2 integrate
.. //depot/projects/hammer/sys/pci/if_pcn.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#11 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#8 integrate
.. //depot/projects/hammer/sys/pci/if_sk.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#9 integrate
.. //depot/projects/hammer/sys/pci/if_ti.c#10 integrate
.. //depot/projects/hammer/sys/pci/ncr.c#6 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#14 integrate
.. //depot/projects/hammer/sys/sys/devicestat.h#5 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#9 integrate
.. //depot/projects/hammer/sys/vm/uma_int.h#4 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#16 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#21 integrate
.. //depot/projects/hammer/usr.bin/vgrind/vgrind.sh#3 integrate
.. //depot/projects/hammer/usr.sbin/setfmac/setfsmac.8#2 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#18 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.362 2003/05/21 21:47:20 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.363 2003/05/31 21:29:38 obrien Exp $
 #
 # Make command line options:
 #	-DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -640,11 +640,14 @@
 _strfile=	games/fortune/strfile
 .endif
 
+.if !defined(NO_CXX)
+_gperf=	gnu/usr.bin/gperf
 .if ${BOOTSTRAPPING} < 500113
 _groff=		gnu/usr.bin/groff
 .else
 _groff=		gnu/usr.bin/groff/tmac
 .endif
+.endif
 
 .if ( ${BOOTSTRAPPING} < 450005 || \
     ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 ))
@@ -670,7 +673,7 @@
     usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
     ${_xargs} usr.bin/xinstall ${_yacc} \
     usr.sbin/config ${_kbdcontrol} \
-    gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo
+    ${_gperf} ${_groff} gnu/usr.bin/texinfo
 	@${ECHODIR} "===> ${_tool}"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \

==== //depot/projects/hammer/lib/Makefile#15 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $
+# $FreeBSD: src/lib/Makefile,v 1.158 2003/05/31 18:43:17 mtm Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -29,8 +29,8 @@
 	libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap ${_libpthread} \
 	${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
-	libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \
-	libwrap libxpg4 liby libz
+	libstand ${_libtelnet} ${_libthr} libufs libugidfw libusbhid \
+	${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
@@ -65,6 +65,9 @@
 .if !defined(NOLIBPTHREAD)
 _libpthread=	libpthread
 .endif
+.if !defined(NOLIBTHR)
+_libthr=	libthr
+.endif
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"

==== //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#4 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.6 2003/01/11 07:24:54 marcel Exp $
+# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.7 2003/05/31 19:42:51 marcel Exp $
 
 SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
 	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \
 	fpgetmask.c fpgetround.c fpsetmask.c fpsetround.c frexp.c infinity.c \
-	isinf.c ldexp.c modf.c setjmp.S sigsetjmp.S
+	isinf.c ldexp.c makecontext.c modf.c setjmp.S sigsetjmp.S
 
 # The following may go away if function _Unwind_FindTableEntry()
 # will be part of GCC.

==== //depot/projects/hammer/lib/libc/stdlib/random.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.17 2001/09/07 14:46:36 asmodai Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.18 2003/05/31 21:14:41 schweikh Exp $
 .\"
 .Dd June 4, 1993
 .Dt RANDOM 3
@@ -100,7 +100,7 @@
 .Pp
 The
 .Fn srandomdev
-routine initialize a state array using
+routine initializes a state array using the
 .Xr random 4
 random number device which returns good random numbers,
 suitable for cryptographic use.

==== //depot/projects/hammer/share/man/man8/MAKEDEV.8#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man8/MAKEDEV.8,v 1.1 2003/03/25 15:07:01 keramida Exp $
+.\" $FreeBSD: src/share/man/man8/MAKEDEV.8,v 1.2 2003/05/31 18:49:23 ru Exp $
 .\"
 .Dd March 25, 2003
 .Dt MAKEDEV 8
@@ -31,9 +31,13 @@
 .Nm MAKEDEV
 .Nd old script for creating device nodes
 .Sh DESCRIPTION
-The MAKEDEV script was deprecated by
+The
+.Nm
+script was deprecated by
 .Xr devfs 5
-and removed from FreeBSD after
+and removed from
+.Fx
+after
 .Xr devfs 5
 became mandatory.
 .Sh SEE ALSO

==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#4 (text+ko) ====

@@ -92,7 +92,7 @@
  *
  ****************************************************************************/
 
-/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.23 2003/05/30 01:02:52 peter Exp $ */
+/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -120,11 +120,8 @@
    nasty interactions between app code and the stub (for instance if user steps
    into strlen, etc..) */
 
-#define strlen	gdb_strlen
-#define strcpy	gdb_strcpy
-
 static int
-strlen (const char *s)
+gdb_strlen (const char *s)
 {
   const char *s1 = s;
 
@@ -134,7 +131,7 @@
 }
 
 static char *
-strcpy (char *dst, const char *src)
+gdb_strcpy (char *dst, const char *src)
 {
   char *retval = dst;
 
@@ -223,7 +220,7 @@
 
 		  /* remove sequence chars from buffer */
 
-		  count = strlen (buffer);
+		  count = gdb_strlen (buffer);
 		  for (i=3; i <= count; i++)
 		    buffer[i-3] = buffer[i];
 		}
@@ -512,7 +509,7 @@
 
 	case 'G':		/* set the value of the CPU registers - return OK */
 	  hex2mem (&remcomInBuffer[1], (vm_offset_t)&registers, NUMREGBYTES);
-	  strcpy (remcomOutBuffer, "OK");
+	  gdb_strcpy (remcomOutBuffer, "OK");
 	  break;
 
 	case 'P':		/* Set the value of one register */
@@ -526,10 +523,10 @@
 		&& regno < NUM_REGS)
 	      {
 		hex2mem (ptr, (vm_offset_t)&registers + regno * 4, 4);
-		strcpy(remcomOutBuffer,"OK");
+		gdb_strcpy(remcomOutBuffer,"OK");
 	      }
 	    else
-	      strcpy (remcomOutBuffer, "P01");
+	      gdb_strcpy (remcomOutBuffer, "P01");
 	    break;
 	  }
 	case 'm':	/* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
@@ -542,11 +539,11 @@
 	      && hexToInt (&ptr, &length))
 	    {
 	      if (mem2hex((vm_offset_t) addr, remcomOutBuffer, length) == NULL)
-		strcpy (remcomOutBuffer, "E03");
+		gdb_strcpy (remcomOutBuffer, "E03");
 	      break;
 	    }
 	  else
-	    strcpy (remcomOutBuffer, "E01");
+	    gdb_strcpy (remcomOutBuffer, "E01");
 	  break;
 
 	case 'M': /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
@@ -561,12 +558,12 @@
 	      && *(ptr++) == ':')
 	    {
 	      if (hex2mem(ptr, (vm_offset_t) addr, length) == NULL)
-		strcpy (remcomOutBuffer, "E03");
+		gdb_strcpy (remcomOutBuffer, "E03");
 	      else
-		strcpy (remcomOutBuffer, "OK");
+		gdb_strcpy (remcomOutBuffer, "OK");
 	    }
 	  else
-	    strcpy (remcomOutBuffer, "E02");
+	    gdb_strcpy (remcomOutBuffer, "E02");
 	  break;
 
 	  /* cAA..AA    Continue at address AA..AA(optional) */

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.56 2003/05/30 01:01:07 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.57 2003/05/31 22:02:11 peter Exp $
  */
 
 #include <sys/param.h>
@@ -567,7 +567,7 @@
 	case DBREG_DR7_WRONLY:
 	case DBREG_DR7_RDWR:
 		break;
-	default : return (-1); break;
+	default : return (-1);
 	}
 	
 	/*
@@ -577,7 +577,7 @@
 	case 1	: mask = 0x00; break;
 	case 2	: mask = 0x01 << 2; break;
 	case 4	: mask = 0x03 << 2; break;
-	default : return (-1); break;
+	default : return (-1);
 	}
 
 	mask |= access;

==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#9 (text+ko) ====

@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.52 2003/05/23 05:04:53 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $
  */
 
 /*
@@ -411,7 +411,6 @@
 nexus_setup_intr(device_t bus, device_t child, struct resource *irq,
 		 int flags, void (*ihand)(void *), void *arg, void **cookiep)
 {
-	driver_t	*driver;
 	int		error;
 
 	/* somebody tried to setup an irq that failed to allocate! */
@@ -422,8 +421,6 @@
 	if ((irq->r_flags & RF_SHAREABLE) == 0)
 		flags |= INTR_EXCL;
 
-	driver = device_get_driver(child);
-
 	/*
 	 * We depend here on rman_activate_resource() being idempotent.
 	 */

==== //depot/projects/hammer/sys/cam/cam.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam.c,v 1.5 2002/01/09 03:38:58 msmith Exp $
+ * $FreeBSD: src/sys/cam/cam.c,v 1.6 2003/05/31 20:46:21 phk Exp $
  */
 #include <sys/param.h>
 
@@ -236,6 +236,7 @@
 				/* FALLTHROUGH */
 			case CAM_EPF_MINIMAL:
 				proto_flags |= CAM_ESF_PRINT_STATUS;
+				/* FALLTHROUGH */
 			default:
 				break;
 			}

==== //depot/projects/hammer/sys/cam/cam_xpt.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.132 2003/03/08 08:01:26 phk Exp $
+ * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.133 2003/05/31 20:46:21 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -2995,8 +2995,8 @@
 			  	       &path->device->inq_data),
 			  scsi_cdb_string(start_ccb->csio.cdb_io.cdb_bytes,
 					  cdb_str, sizeof(cdb_str))));
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case XPT_TARGET_IO:
 	case XPT_CONT_TARGET_IO:
 		start_ccb->csio.sense_resid = 0;
@@ -3111,8 +3111,8 @@
 		 * If we weren't able to take care of the abort request
 		 * in the XPT, pass the request down to the SIM for processing.
 		 */
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case XPT_ACCEPT_TARGET_IO:
 	case XPT_EN_LUN:
 	case XPT_IMMED_NOTIFY:
@@ -3271,7 +3271,6 @@
 		int s;
 		dev_pos_type position_type;
 		struct ccb_dev_match *cdm;
-		int ret;
 
 		cdm = &start_ccb->cdm;
 
@@ -3316,10 +3315,10 @@
 
 		switch(position_type & CAM_DEV_POS_TYPEMASK) {
 		case CAM_DEV_POS_EDT:
-			ret = xptedtmatch(cdm);
+			xptedtmatch(cdm);
 			break;
 		case CAM_DEV_POS_PDRV:
-			ret = xptperiphlistmatch(cdm);
+			xptperiphlistmatch(cdm);
 			break;
 		default:
 			cdm->status = CAM_DEV_MATCH_ERROR;
@@ -5639,8 +5638,8 @@
 		xpt_print_path(periph->path);
 		printf("Unable to mode sense control page - malloc failure\n");
 		softc->action = PROBE_SERIAL_NUM;
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case PROBE_SERIAL_NUM:
 	{
 		struct scsi_vpd_unit_serial_number *serial_buf;
@@ -6913,7 +6912,6 @@
 
 		if (ccb_h->flags & CAM_HIGH_POWER) {
 			struct highpowerlist	*hphead;
-			struct cam_ed		*device;
 			union ccb		*send_ccb;
 
 			hphead = &highpowerq;
@@ -6929,7 +6927,6 @@
 			 * Any high powered commands queued up?
 			 */
 			if (send_ccb != NULL) {
-				device = send_ccb->ccb_h.path->device;
 
 				STAILQ_REMOVE_HEAD(hphead, xpt_links.stqe);
 

==== //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.37 2003/04/01 15:06:22 phk Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.38 2003/05/31 20:46:21 phk Exp $
  */
 
 #include <sys/param.h>
@@ -458,8 +458,8 @@
 		LIST_FOREACH(ccbh, &softc->pending_ccbs, periph_links.le)
 			ccbh->ccb_state |= PT_CCB_RETRY_UA;
 		splx(s);
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	default:
 		cam_periph_async(periph, code, path, arg);
 		break;

==== //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.16 2003/02/02 13:17:27 alfred Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.17 2003/05/31 20:44:32 phk Exp $
  */
 
 #include <sys/param.h>
@@ -399,11 +399,8 @@
 static cam_status
 targbhctor(struct cam_periph *periph, void *arg)
 {
-	struct ccb_pathinq *cpi;
 	struct targbh_softc *softc;
 
-	cpi = (struct ccb_pathinq *)arg;
-
 	/* Allocate our per-instance private storage */
 	softc = (struct targbh_softc *)malloc(sizeof(*softc),
 					      M_DEVBUF, M_NOWAIT);
@@ -436,13 +433,13 @@
 	targbhdislun(periph);
 
 	switch (softc->init_level) {
+	case 0:
+		panic("targdtor - impossible init level");;
+	case 1:
+		/* FALLTHROUGH */
 	default:
-		/* FALLTHROUGH */
-	case 1:
 		free(softc, M_DEVBUF);
 		break;
-	case 0:
-		panic("targdtor - impossible init level");;
 	}
 }
 

==== //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#3 (text+ko) ====

@@ -28,7 +28,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/sys/compat/svr4/svr4_socket.c,v 1.20 2003/02/19 05:46:59 imp Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.21 2003/05/31 20:33:18 phk Exp $
  */
 
 /*
@@ -62,18 +62,6 @@
 #include <compat/svr4/svr4_sockmod.h>
 #include <compat/svr4/svr4_proto.h>
 
-struct svr4_sockcache_entry {
-	struct proc *p;		/* Process for the socket		*/
-	void *cookie;		/* Internal cookie used for matching	*/
-	struct sockaddr_un sock;/* Pathname for the socket		*/
-	udev_t dev;		/* Device where the socket lives on	*/
-	ino_t ino;		/* Inode where the socket lives on	*/
-	TAILQ_ENTRY(svr4_sockcache_entry) entries;
-};
-
-extern TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head;
-extern int svr4_str_initialized;
-
 struct sockaddr_un *
 svr4_find_socket(td, fp, dev, ino)
 	struct thread *td;

==== //depot/projects/hammer/sys/compat/svr4/svr4_socket.h#2 (text+ko) ====

@@ -28,7 +28,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/sys/compat/svr4/svr4_socket.h,v 1.6 2002/03/20 05:41:38 alfred Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_socket.h,v 1.7 2003/05/31 20:33:18 phk Exp $
  */
 
 #ifndef _SVR4_SOCKET_H_
@@ -53,4 +53,17 @@
 void svr4_delete_socket(struct proc *, struct file *);
 int svr4_add_socket(struct thread *, const char *, struct stat *);
 
+struct svr4_sockcache_entry {
+	struct proc *p;		/* Process for the socket		*/
+	void *cookie;		/* Internal cookie used for matching	*/
+	struct sockaddr_un sock;/* Pathname for the socket		*/
+	udev_t dev;		/* Device where the socket lives on	*/
+	ino_t ino;		/* Inode where the socket lives on	*/
+	TAILQ_ENTRY(svr4_sockcache_entry) entries;
+};
+
+TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry);
+extern struct svr4_sockcache_head svr4_head;
+extern int svr4_str_initialized;
+
 #endif /* _SVR4_SOCKET_H_ */

==== //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#4 (text+ko) ====

@@ -25,7 +25,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/sys/compat/svr4/svr4_stat.c,v 1.16 2002/12/14 01:56:24 alfred Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.17 2003/05/31 20:33:18 phk Exp $
  */
 
 #include <sys/param.h>
@@ -39,6 +39,7 @@
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
+#include <sys/un.h>
 
 #include <vm/vm.h>
 

==== //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#5 (text+ko) ====

@@ -27,7 +27,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/sys/compat/svr4/svr4_sysvec.c,v 1.30 2003/03/21 19:49:34 jhb Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.31 2003/05/31 20:33:18 phk Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -61,7 +61,6 @@
 #include <compat/svr4/svr4_syscall.h>
 #include <compat/svr4/svr4_signal.h>
 #include <compat/svr4/svr4_sockio.h>
-#include <compat/svr4/svr4_socket.h>
 #include <compat/svr4/svr4_errno.h>
 #include <compat/svr4/svr4_proto.h>
 #include <compat/svr4/svr4_siginfo.h>

==== //depot/projects/hammer/sys/conf/kern.post.mk#8 (text+ko) ====

@@ -6,9 +6,14 @@
 # should be defined in the kern.pre.mk so that port makefiles can
 # override or augment them.
 #
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.41 2003/04/30 12:19:25 markm Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.42 2003/05/31 21:16:12 phk Exp $
 #
 
+# In case the config had a makeoptions DESTDIR...
+.if defined(DESTDIR)
+MKMODULESENV+=	DESTDIR="${DESTDIR}"
+.endif
+
 .MAIN: all
 
 .for target in all clean cleandepend cleandir clobber depend install \

==== //depot/projects/hammer/sys/ddb/db_break.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/ddb/db_break.c,v 1.21 2002/12/31 06:51:19 jake Exp $
+ * $FreeBSD: src/sys/ddb/db_break.c,v 1.22 2003/05/31 20:43:47 phk Exp $
  */
 
 /*
@@ -400,6 +400,7 @@
 	case KEY_CRTLB:
 		if (*state == KEY_CRTLB)
 			brk = 1;
+		/* FALLTHROUGH */
 	default:
 		*state = 0;
 		break;

==== //depot/projects/hammer/sys/ddb/db_input.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/ddb/db_input.c,v 1.33 2003/04/04 12:10:04 des Exp $
+ * $FreeBSD: src/sys/ddb/db_input.c,v 1.34 2003/05/31 19:00:02 phk Exp $
  */
 
 /*
@@ -267,6 +267,7 @@
 		 */
 		c = '\r';
 	    case '\n':
+		/* FALLTHROUGH */
 	    case '\r':
 		*db_le++ = c;
 		return (1);

==== //depot/projects/hammer/sys/dev/amd/amd.c#4 (text+ko) ====

@@ -30,7 +30,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/sys/dev/amd/amd.c,v 1.18 2003/05/27 04:59:57 scottl Exp $
+ * $FreeBSD: src/sys/dev/amd/amd.c,v 1.19 2003/05/31 20:43:17 phk Exp $
  */
 
 /*
@@ -393,13 +393,12 @@
 amd_action(struct cam_sim * psim, union ccb * pccb)
 {
 	struct amd_softc *    amd;
-	u_int   target_id, target_lun;
+	u_int   target_id;
 
 	CAM_DEBUG(pccb->ccb_h.path, CAM_DEBUG_TRACE, ("amd_action\n"));
 
 	amd = (struct amd_softc *) cam_sim_softc(psim);
 	target_id = pccb->ccb_h.target_id;
-	target_lun = pccb->ccb_h.target_lun;
 
 	switch (pccb->ccb_h.func_code) {
 	case XPT_SCSI_IO:
@@ -535,6 +534,7 @@
 	case XPT_TERM_IO:
 		pccb->ccb_h.status = CAM_REQ_INVALID;
 		xpt_done(pccb);
+		/* XXX: intentional fall-through ?? */
 	case XPT_GET_TRAN_SETTINGS:
 	{
 		struct ccb_trans_settings *cts;
@@ -927,7 +927,6 @@
 	u_int command;
 	u_int target;
 	u_int lun;
-	int tagged;
 
 	pccb = pSRB->pccb;
 	pcsio = &pccb->csio;
@@ -952,7 +951,6 @@
 		identify_msg |= MSG_IDENTIFY_DISCFLAG;
 
 	amd_write8(amd, SCSIFIFOREG, identify_msg);
-	tagged = 0;
 	if ((targ_info->disc_tag & AMD_CUR_TAGENB) == 0
 	  || (identify_msg & MSG_IDENTIFY_DISCFLAG) == 0)
 		pccb->ccb_h.flags &= ~CAM_TAG_ACTION_VALID;
@@ -966,7 +964,6 @@
 		pSRB->SRBState = SRB_START;
 		amd_write8(amd, SCSIFIFOREG, pcsio->tag_action);
 		amd_write8(amd, SCSIFIFOREG, pSRB->TagNumber);
-		tagged++;
 	} else {
 		command = SEL_W_ATN;
 		pSRB->SRBState = SRB_START;
@@ -1213,7 +1210,6 @@
 static int
 amdparsemsg(struct amd_softc *amd)
 {
-	struct	amd_target_info *targ_info;
 	int	reject;
 	int	done;
 	int	response;
@@ -1222,8 +1218,6 @@
 	response = FALSE;
 	reject = FALSE;
 
-	targ_info = &amd->tinfo[amd->cur_target];
-
 	/*
 	 * Parse as much of the message as is availible,
 	 * rejecting it if we don't support it.  When
@@ -1877,12 +1871,9 @@
 	int	   intflag;
 	struct amd_sg *ptr2;
 	u_int32_t   swlval;
-	u_int   target_id, target_lun;
 
 	pccb = pSRB->pccb;
 	pcsio = &pccb->csio;
-	target_id = pSRB->pccb->ccb_h.target_id;
-	target_lun = pSRB->pccb->ccb_h.target_lun;
 
 	CAM_DEBUG(pccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("SRBdone - TagNumber %d\n", pSRB->TagNumber));

==== //depot/projects/hammer/sys/dev/bge/if_bge.c#15 (text+ko) ====

@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.41 2003/05/21 07:00:49 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.42 2003/05/31 20:42:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -475,12 +475,10 @@
 	int phy, reg;
 {
 	struct bge_softc *sc;
-	struct ifnet *ifp;
 	u_int32_t val, autopoll;
 	int i;
 
 	sc = device_get_softc(dev);
-	ifp = &sc->arpcom.ac_if;
 
 	if (phy != 1)
 		switch(sc->bge_chipid) {

==== //depot/projects/hammer/sys/dev/bktr/bktr_os.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.34 2003/03/25 00:07:00 jake Exp $ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.35 2003/05/31 20:41:52 phk Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -471,19 +471,16 @@
 static int
 bktr_detach( device_t dev )
 {
-	unsigned int	unit;
-
 	struct bktr_softc *bktr = device_get_softc(dev);
 
-	unit = device_get_unit(dev);
-
 	/* Disable the brooktree device */
 	OUTL(bktr, BKTR_INT_MASK, ALL_INTS_DISABLED);
 	OUTW(bktr, BKTR_GPIO_DMA_CTL, FIFO_RISC_DISABLED);
 
 #if defined(BKTR_USE_FREEBSD_SMBUS)
 	if (bt848_i2c_detach(dev))
-		printf("bktr%d: i2c_attach: can't attach\n", unit);
+		printf("bktr%d: i2c_attach: can't attach\n",
+		     device_get_unit(dev));
 #endif
 
 	/* Note: We do not free memory for RISC programs, grab buffer, vbi buffers */

==== //depot/projects/hammer/sys/dev/buslogic/bt.c#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.38 2003/05/27 04:59:57 scottl Exp $
+ * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.39 2003/05/31 20:41:08 phk Exp $
  */
 
  /*
@@ -248,22 +248,29 @@
 	}
 	case 7:
 		bus_dmamap_unload(bt->ccb_dmat, bt->ccb_dmamap);
+		/* FALLTHROUGH */
 	case 6:
 		bus_dmamem_free(bt->ccb_dmat, bt->bt_ccb_array,
 				bt->ccb_dmamap);
 		bus_dmamap_destroy(bt->ccb_dmat, bt->ccb_dmamap);
+		/* FALLTHROUGH */
 	case 5:
 		bus_dma_tag_destroy(bt->ccb_dmat);
+		/* FALLTHROUGH */
 	case 4:
 		bus_dmamap_unload(bt->mailbox_dmat, bt->mailbox_dmamap);
+		/* FALLTHROUGH */
 	case 3:
 		bus_dmamem_free(bt->mailbox_dmat, bt->in_boxes,
 				bt->mailbox_dmamap);
 		bus_dmamap_destroy(bt->mailbox_dmat, bt->mailbox_dmamap);
+		/* FALLTHROUGH */
 	case 2:
 		bus_dma_tag_destroy(bt->buffer_dmat);
+		/* FALLTHROUGH */
 	case 1:
 		bus_dma_tag_destroy(bt->mailbox_dmat);
+		/* FALLTHROUGH */
 	case 0:
 		break;
 	}

==== //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.15 2003/03/29 09:46:10 mdodd Exp $
+ * $FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.16 2003/05/31 20:41:08 phk Exp $
  */
 
 #include <sys/param.h>
@@ -162,25 +162,18 @@
 	switch(type) {
 		case EISA_DEVICE_ID_BUSLOGIC_74X_B:
 			return ("Buslogic 74xB SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_BUSLOGIC_74X_C:
 			return ("Buslogic 74xC SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_SDC3222B:
 			return ("Storage Dimensions SDC3222B SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_SDC3222F:
 			return ("Storage Dimensions SDC3222F SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_SDC3222WS:
 			return ("Storage Dimensions SDC3222WS SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_SDC3222WB:
 			return ("Storage Dimensions SDC3222WB SCSI host adapter");
-			break;
 		case EISA_DEVICE_ID_AMI_4801:
 			return ("AMI Series 48 SCSI host adapter");
-			break;
 		default:
 			break;
 	}

==== //depot/projects/hammer/sys/dev/ccd/ccd.c#7 (text+ko) ====

@@ -50,7 +50,7 @@
  *
  *	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ 
  *
- * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.134 2003/04/14 08:49:54 phk Exp $
+ * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.135 2003/05/31 18:52:05 phk Exp $
  */
 
 #include <sys/param.h>
@@ -921,7 +921,6 @@
 {
 	struct ccd_ioctl *ccio;
 	u_int unit;
-	dev_t dev2;
 	int error;
 
 	switch (cmd) {
@@ -978,7 +977,6 @@
 
 		if (!IS_ALLOCATED(unit))
 			return (ENXIO);
-		dev2 = makedev(CDEV_MAJOR, unit * 8 + 2);
 		cs = ccdfind(unit);
 		if (!IS_INITED(cs))
 			return (ENXIO);

==== //depot/projects/hammer/sys/dev/ciss/ciss.c#8 (text+ko) ====

@@ -23,7 +23,7 @@

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305312223.h4VMNTdo047417>