Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 8 Jul 2010 20:38:48 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r209825 - in stable/8/sys: dev/acpica dev/usb fs/procfs geom kern
Message-ID:  <201007082038.o68Kcmui019934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avg
Date: Thu Jul  8 20:38:48 2010
New Revision: 209825
URL: http://svn.freebsd.org/changeset/base/209825

Log:
  MFC r209062: fix a few cases where a string is passed via format
  argument instead of via %s
  
  Note:	no MFC to stable/7

Modified:
  stable/8/sys/dev/acpica/acpi_thermal.c
  stable/8/sys/dev/usb/usb_dev.c
  stable/8/sys/dev/usb/usb_device.c
  stable/8/sys/dev/usb/usb_process.c
  stable/8/sys/fs/procfs/procfs_type.c
  stable/8/sys/geom/geom_dev.c
  stable/8/sys/kern/subr_kdb.c
  stable/8/sys/kern/subr_taskqueue.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/acpica/acpi_thermal.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi_thermal.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/dev/acpica/acpi_thermal.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -1171,7 +1171,6 @@ static int
 acpi_tz_cooling_thread_start(struct acpi_tz_softc *sc)
 {
     int error;
-    char name[16];
 
     ACPI_LOCK(thermal);
     if (sc->tz_cooling_proc_running) {
@@ -1182,10 +1181,9 @@ acpi_tz_cooling_thread_start(struct acpi
     ACPI_UNLOCK(thermal);
     error = 0;
     if (sc->tz_cooling_proc == NULL) {
-	snprintf(name, sizeof(name), "acpi_cooling%d",
-	    device_get_unit(sc->tz_dev));
 	error = kproc_create(acpi_tz_cooling_thread, sc,
-	    &sc->tz_cooling_proc, RFHIGHPID, 0, name);
+	    &sc->tz_cooling_proc, RFHIGHPID, 0, "acpi_cooling%d",
+	    device_get_unit(sc->tz_dev));
 	if (error != 0) {
 	    device_printf(sc->tz_dev, "could not create thread - %d", error);
 	    ACPI_LOCK(thermal);

Modified: stable/8/sys/dev/usb/usb_dev.c
==============================================================================
--- stable/8/sys/dev/usb/usb_dev.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/dev/usb/usb_dev.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -1733,7 +1733,7 @@ usb_fifo_attach(struct usb_device *udev,
 
 		/* Now, create the device itself */
 		f_sc->dev = make_dev(&usb_devsw, 0, uid, gid, mode,
-		    devname);
+		    "%s", devname);
 		/* XXX setting si_drv1 and creating the device is not atomic! */
 		f_sc->dev->si_drv1 = pd;
 	}

Modified: stable/8/sys/dev/usb/usb_device.c
==============================================================================
--- stable/8/sys/dev/usb/usb_device.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/dev/usb/usb_device.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -1577,7 +1577,7 @@ usb_alloc_device(device_t parent_dev, st
 	udev->ctrl_dev = usb_make_dev(udev, 0, FREAD|FWRITE);
 
 	/* Create a link from /dev/ugenX.X to the default endpoint */
-	make_dev_alias(udev->ctrl_dev, udev->ugen_name);
+	make_dev_alias(udev->ctrl_dev, "%s", udev->ugen_name);
 #endif
 	if (udev->flags.usb_mode == USB_MODE_HOST) {
 

Modified: stable/8/sys/dev/usb/usb_process.c
==============================================================================
--- stable/8/sys/dev/usb/usb_process.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/dev/usb/usb_process.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -221,7 +221,7 @@ usb_proc_create(struct usb_process *up, 
 	cv_init(&up->up_drain, "usbdrain");
 
 	if (USB_THREAD_CREATE(&usb_process, up,
-	    &up->up_ptr, pmesg)) {
+	    &up->up_ptr, "%s", pmesg)) {
 		DPRINTFN(0, "Unable to create USB process.");
 		up->up_ptr = NULL;
 		goto error;

Modified: stable/8/sys/fs/procfs/procfs_type.c
==============================================================================
--- stable/8/sys/fs/procfs/procfs_type.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/fs/procfs/procfs_type.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -48,9 +48,9 @@ procfs_doproctype(PFS_FILL_ARGS)
 	static const char *none = "Not Available";
 
 	if (p != NULL && p->p_sysent && p->p_sysent->sv_name)
-		sbuf_printf(sb, p->p_sysent->sv_name);
+		sbuf_printf(sb, "%s", p->p_sysent->sv_name);
 	else
-		sbuf_printf(sb, none);
+		sbuf_printf(sb, "%s", none);
 	sbuf_putc(sb, '\n');
 	return (0);
 }

Modified: stable/8/sys/geom/geom_dev.c
==============================================================================
--- stable/8/sys/geom/geom_dev.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/geom/geom_dev.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -127,7 +127,7 @@ g_dev_taste(struct g_class *mp, struct g
 	KASSERT(error == 0,
 	    ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error));
 	dev = make_dev(&g_dev_cdevsw, 0,
-	    UID_ROOT, GID_OPERATOR, 0640, gp->name);
+	    UID_ROOT, GID_OPERATOR, 0640, "%s", gp->name);
 	if (pp->flags & G_PF_CANDELETE)
 		dev->si_flags |= SI_CANDELETE;
 	dev->si_iosize_max = MAXPHYS;

Modified: stable/8/sys/kern/subr_kdb.c
==============================================================================
--- stable/8/sys/kern/subr_kdb.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/kern/subr_kdb.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -230,7 +230,7 @@ kdb_panic(const char *msg)
 	stop_cpus_hard(PCPU_GET(other_cpus));
 #endif
 	printf("KDB: panic\n");
-	panic(msg);
+	panic("%s", msg);
 }
 
 void

Modified: stable/8/sys/kern/subr_taskqueue.c
==============================================================================
--- stable/8/sys/kern/subr_taskqueue.c	Thu Jul  8 20:18:52 2010	(r209824)
+++ stable/8/sys/kern/subr_taskqueue.c	Thu Jul  8 20:38:48 2010	(r209825)
@@ -322,7 +322,7 @@ taskqueue_start_threads(struct taskqueue
 	for (i = 0; i < count; i++) {
 		if (count == 1)
 			error = kthread_add(taskqueue_thread_loop, tqp, NULL,
-			    &tq->tq_threads[i], RFSTOPPED, 0, ktname);
+			    &tq->tq_threads[i], RFSTOPPED, 0, "%s", ktname);
 		else
 			error = kthread_add(taskqueue_thread_loop, tqp, NULL,
 			    &tq->tq_threads[i], RFSTOPPED, 0,

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