From owner-svn-src-all@FreeBSD.ORG Fri Dec 16 22:35:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FF6B106566C; Fri, 16 Dec 2011 22:35:20 +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 34E338FC12; Fri, 16 Dec 2011 22:35:20 +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 pBGMZKxF029889; Fri, 16 Dec 2011 22:35:20 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBGMZK2k029887; Fri, 16 Dec 2011 22:35:20 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201112162235.pBGMZK2k029887@svn.freebsd.org> From: Dimitry Andric Date: Fri, 16 Dec 2011 22:35:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228602 - head/sbin/camcontrol X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2011 22:35:20 -0000 Author: dim Date: Fri Dec 16 22:35:19 2011 New Revision: 228602 URL: http://svn.freebsd.org/changeset/base/228602 Log: In sbin/camcontrol/camcontrol.c, fix a few warnings about format strings not being literals. MFC after: 1 week Modified: head/sbin/camcontrol/camcontrol.c Modified: head/sbin/camcontrol/camcontrol.c ============================================================================== --- head/sbin/camcontrol/camcontrol.c Fri Dec 16 22:19:13 2011 (r228601) +++ head/sbin/camcontrol/camcontrol.c Fri Dec 16 22:35:19 2011 (r228602) @@ -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); @@ -4449,7 +4449,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); @@ -4567,7 +4567,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); @@ -4872,7 +4872,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); @@ -4954,7 +4954,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); @@ -5351,7 +5351,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); @@ -5431,7 +5431,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);