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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
