From owner-svn-src-stable-9@FreeBSD.ORG Sat Dec 31 20:01:41 2011 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C1491065670; Sat, 31 Dec 2011 20:01:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1B1C58FC18; Sat, 31 Dec 2011 20:01:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBVK1eqZ080822; Sat, 31 Dec 2011 20:01:40 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVK1eGm080820; Sat, 31 Dec 2011 20:01:40 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201112312001.pBVK1eGm080820@svn.freebsd.org> From: Dimitry Andric Date: Sat, 31 Dec 2011 20:01:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229151 - stable/9/sbin/camcontrol X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Dec 2011 20:01:41 -0000 Author: dim Date: Sat Dec 31 20:01:40 2011 New Revision: 229151 URL: http://svn.freebsd.org/changeset/base/229151 Log: MFC r228602: In sbin/camcontrol/camcontrol.c, fix a few warnings about format strings not being literals. Modified: stable/9/sbin/camcontrol/camcontrol.c Directory Properties: stable/9/sbin/camcontrol/ (props changed) Modified: stable/9/sbin/camcontrol/camcontrol.c ============================================================================== --- stable/9/sbin/camcontrol/camcontrol.c Sat Dec 31 20:01:09 2011 (r229150) +++ stable/9/sbin/camcontrol/camcontrol.c Sat Dec 31 20:01:40 2011 (r229151) @@ -2506,7 +2506,7 @@ scsicmd(struct cam_device *device, int a if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -4469,7 +4469,7 @@ smpcmd(struct cam_device *device, int ar if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -4587,7 +4587,7 @@ try_long: if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -4892,7 +4892,7 @@ smpphycontrol(struct cam_device *device, if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -4974,7 +4974,7 @@ smpmaninfo(struct cam_device *device, in if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -5371,7 +5371,7 @@ smpphylist(struct cam_device *device, in if (((retval = cam_send_ccb(device, ccb)) < 0) || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr); @@ -5451,7 +5451,7 @@ smpphylist(struct cam_device *device, in if (((retval = cam_send_ccb(device, ccb)) < 0) || (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && (disresponse->function_result != SMP_FR_PHY_VACANT))) { - const char *warnstr = "error sending command"; + const char warnstr[] = "error sending command"; if (retval < 0) warn(warnstr);