From 3d036044393a0ceb55327fdd6a27707c0d014786 Mon Sep 17 00:00:00 2001
From: dpgilbert <dpgilbert@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sun, 16 Nov 2003 12:20:14 +0000
Subject: [PATCH] minor compiler warning cleanup
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1238 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/os_linux.c | 10 +++++-----
sm5/os_linux.cpp | 10 +++++-----
sm5/scsicmds.c | 18 +++++++++---------
sm5/scsicmds.cpp | 18 +++++++++---------
sm5/scsicmds.h | 6 +++---
sm5/scsiprint.c | 19 ++++++++++---------
sm5/scsiprint.cpp | 19 ++++++++++---------
7 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/sm5/os_linux.c b/sm5/os_linux.c
index ea1da5c52..29b566541 100644
--- a/sm5/os_linux.c
+++ b/sm5/os_linux.c
@@ -60,7 +60,7 @@
#include "smartd.h"
#include "utility.h"
-const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.26 2003/11/14 05:28:14 dpgilbert Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.27 2003/11/16 12:20:14 dpgilbert Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
// to hold onto exit code for atexit routine
@@ -123,8 +123,8 @@ int get_dev_names(char*** names, const char* pattern, const char* name, int max)
}
// did we find too many paths?
- lim = globbuf.gl_pathc < max ? globbuf.gl_pathc : max;
- if (lim < globbuf.gl_pathc)
+ lim = ((int)globbuf.gl_pathc < max) ? (int)globbuf.gl_pathc : max;
+ if (lim < (int)globbuf.gl_pathc)
pout("glob(3) found %d > MAX=%d devices matching pattern %s: ignoring %d paths\n",
(int)globbuf.gl_pathc, max, pattern, (int)(globbuf.gl_pathc-max));
@@ -470,11 +470,11 @@ int do_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop, int report)
const unsigned char * ucp = iop->cmnd;
const char * np;
char buff[256];
- const size_t sz = sizeof(buff);
+ const int sz = (int)sizeof(buff);
np = scsi_get_opcode_name(ucp[0]);
j = snprintf(buff, sz, " [%s: ", np ? np : "<unknown opcode>");
- for (k = 0; k < iop->cmnd_len; ++k)
+ for (k = 0; k < (int)iop->cmnd_len; ++k)
j += snprintf(&buff[j], (sz > j ? (sz - j) : 0), "%02x ", ucp[k]);
if ((report > 1) &&
(DXFER_TO_DEVICE == iop->dxfer_dir) && (iop->dxferp)) {
diff --git a/sm5/os_linux.cpp b/sm5/os_linux.cpp
index d7e2acd6e..7e5b207b2 100644
--- a/sm5/os_linux.cpp
+++ b/sm5/os_linux.cpp
@@ -60,7 +60,7 @@
#include "smartd.h"
#include "utility.h"
-const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.26 2003/11/14 05:28:14 dpgilbert Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.27 2003/11/16 12:20:14 dpgilbert Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
// to hold onto exit code for atexit routine
@@ -123,8 +123,8 @@ int get_dev_names(char*** names, const char* pattern, const char* name, int max)
}
// did we find too many paths?
- lim = globbuf.gl_pathc < max ? globbuf.gl_pathc : max;
- if (lim < globbuf.gl_pathc)
+ lim = ((int)globbuf.gl_pathc < max) ? (int)globbuf.gl_pathc : max;
+ if (lim < (int)globbuf.gl_pathc)
pout("glob(3) found %d > MAX=%d devices matching pattern %s: ignoring %d paths\n",
(int)globbuf.gl_pathc, max, pattern, (int)(globbuf.gl_pathc-max));
@@ -470,11 +470,11 @@ int do_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop, int report)
const unsigned char * ucp = iop->cmnd;
const char * np;
char buff[256];
- const size_t sz = sizeof(buff);
+ const int sz = (int)sizeof(buff);
np = scsi_get_opcode_name(ucp[0]);
j = snprintf(buff, sz, " [%s: ", np ? np : "<unknown opcode>");
- for (k = 0; k < iop->cmnd_len; ++k)
+ for (k = 0; k < (int)iop->cmnd_len; ++k)
j += snprintf(&buff[j], (sz > j ? (sz - j) : 0), "%02x ", ucp[k]);
if ((report > 1) &&
(DXFER_TO_DEVICE == iop->dxfer_dir) && (iop->dxferp)) {
diff --git a/sm5/scsicmds.c b/sm5/scsicmds.c
index f8f9597cc..749d4bd40 100644
--- a/sm5/scsicmds.c
+++ b/sm5/scsicmds.c
@@ -46,7 +46,7 @@
#include "utility.h"
#include "extern.h"
-const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.60 2003/11/15 04:29:52 dpgilbert Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID;
+const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.61 2003/11/16 12:15:24 dpgilbert Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID;
/* for passing global control variables */
extern smartmonctrl *con;
@@ -334,7 +334,7 @@ int scsiModeSense(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen)
* 2 if command not supported (then MODE SELECT(10) may be supported),
* 3 if field in command not supported, 4 if bad parameter to command
* or returns negated errno. SPC sections 7.7 and 8.4 */
-int scsiModeSelect(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen)
+int scsiModeSelect(int device, int sp, UINT8 *pBuf, int bufLen)
{
struct scsi_cmnd_io io_hdr;
struct scsi_sense_disect sinfo;
@@ -421,7 +421,7 @@ int scsiModeSense10(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen)
* command not supported (then MODE SELECT(6) may be supported), 3 if field
* in command not supported, 4 if bad parameter to command or returns
* negated errno. SAM sections 7.8 and 8.4 */
-int scsiModeSelect10(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen)
+int scsiModeSelect10(int device, int sp, UINT8 *pBuf, int bufLen)
{
struct scsi_cmnd_io io_hdr;
struct scsi_sense_disect sinfo;
@@ -750,8 +750,10 @@ int scsiFetchIECmpage(int device, struct scsi_iec_mode_page *iecp, int modese_le
iecp->modese_len = 6;
else if (SIMPLE_ERR_BAD_OPCODE == err)
iecp->modese_len = 10;
- else
+ else {
+ iecp->modese_len = 0;
return err;
+ }
}
}
if (10 == iecp->modese_len) {
@@ -890,11 +892,9 @@ int scsiSetExceptionControlAndWarning(int device, int enabled,
}
}
if (10 == iecp->modese_len)
- err = scsiModeSelect10(device, INFORMATIONAL_EXCEPTIONS_CONTROL,
- sp, rout, sizeof(rout));
+ err = scsiModeSelect10(device, sp, rout, sizeof(rout));
else if (6 == iecp->modese_len)
- err = scsiModeSelect(device, INFORMATIONAL_EXCEPTIONS_CONTROL,
- sp, rout, sizeof(rout));
+ err = scsiModeSelect(device, sp, rout, sizeof(rout));
return err;
}
@@ -1623,7 +1623,7 @@ void scsiDecodeErrCounterPage(unsigned char * resp,
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(*ullp)) {
+ if (k > (int)sizeof(*ullp)) {
xp += (k - sizeof(*ullp));
k = sizeof(*ullp);
}
diff --git a/sm5/scsicmds.cpp b/sm5/scsicmds.cpp
index 288ad90ca..a93a4124a 100644
--- a/sm5/scsicmds.cpp
+++ b/sm5/scsicmds.cpp
@@ -46,7 +46,7 @@
#include "utility.h"
#include "extern.h"
-const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.60 2003/11/15 04:29:52 dpgilbert Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID;
+const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.61 2003/11/16 12:15:24 dpgilbert Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID;
/* for passing global control variables */
extern smartmonctrl *con;
@@ -334,7 +334,7 @@ int scsiModeSense(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen)
* 2 if command not supported (then MODE SELECT(10) may be supported),
* 3 if field in command not supported, 4 if bad parameter to command
* or returns negated errno. SPC sections 7.7 and 8.4 */
-int scsiModeSelect(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen)
+int scsiModeSelect(int device, int sp, UINT8 *pBuf, int bufLen)
{
struct scsi_cmnd_io io_hdr;
struct scsi_sense_disect sinfo;
@@ -421,7 +421,7 @@ int scsiModeSense10(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen)
* command not supported (then MODE SELECT(6) may be supported), 3 if field
* in command not supported, 4 if bad parameter to command or returns
* negated errno. SAM sections 7.8 and 8.4 */
-int scsiModeSelect10(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen)
+int scsiModeSelect10(int device, int sp, UINT8 *pBuf, int bufLen)
{
struct scsi_cmnd_io io_hdr;
struct scsi_sense_disect sinfo;
@@ -750,8 +750,10 @@ int scsiFetchIECmpage(int device, struct scsi_iec_mode_page *iecp, int modese_le
iecp->modese_len = 6;
else if (SIMPLE_ERR_BAD_OPCODE == err)
iecp->modese_len = 10;
- else
+ else {
+ iecp->modese_len = 0;
return err;
+ }
}
}
if (10 == iecp->modese_len) {
@@ -890,11 +892,9 @@ int scsiSetExceptionControlAndWarning(int device, int enabled,
}
}
if (10 == iecp->modese_len)
- err = scsiModeSelect10(device, INFORMATIONAL_EXCEPTIONS_CONTROL,
- sp, rout, sizeof(rout));
+ err = scsiModeSelect10(device, sp, rout, sizeof(rout));
else if (6 == iecp->modese_len)
- err = scsiModeSelect(device, INFORMATIONAL_EXCEPTIONS_CONTROL,
- sp, rout, sizeof(rout));
+ err = scsiModeSelect(device, sp, rout, sizeof(rout));
return err;
}
@@ -1623,7 +1623,7 @@ void scsiDecodeErrCounterPage(unsigned char * resp,
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(*ullp)) {
+ if (k > (int)sizeof(*ullp)) {
xp += (k - sizeof(*ullp));
k = sizeof(*ullp);
}
diff --git a/sm5/scsicmds.h b/sm5/scsicmds.h
index 823bc75b8..2f9be8bbf 100644
--- a/sm5/scsicmds.h
+++ b/sm5/scsicmds.h
@@ -32,7 +32,7 @@
#ifndef SCSICMDS_H_
#define SCSICMDS_H_
-#define SCSICMDS_H_CVSID "$Id: scsicmds.h,v 1.38 2003/11/15 02:26:26 dpgilbert Exp $\n"
+#define SCSICMDS_H_CVSID "$Id: scsicmds.h,v 1.39 2003/11/16 12:14:07 dpgilbert Exp $\n"
#include <stdio.h>
#include <stdlib.h>
@@ -269,11 +269,11 @@ int scsiLogSense(int device, int pagenum, UINT8 *pBuf, int bufLen,
int scsiModeSense(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen);
-int scsiModeSelect(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen);
+int scsiModeSelect(int device, int sp, UINT8 *pBuf, int bufLen);
int scsiModeSense10(int device, int pagenum, int pc, UINT8 *pBuf, int bufLen);
-int scsiModeSelect10(int device, int pagenum, int sp, UINT8 *pBuf, int bufLen);
+int scsiModeSelect10(int device, int sp, UINT8 *pBuf, int bufLen);
int scsiModePageOffset(const UINT8 * resp, int len, int modese_len);
diff --git a/sm5/scsiprint.c b/sm5/scsiprint.c
index 8203f1cef..08a02a6f3 100644
--- a/sm5/scsiprint.c
+++ b/sm5/scsiprint.c
@@ -40,7 +40,7 @@
#define GBUF_SIZE 65535
-const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.58 2003/11/15 02:29:16 dpgilbert Exp $"
+const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.59 2003/11/16 12:19:04 dpgilbert Exp $"
EXTERN_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
// control block which points to external global control variables
@@ -281,9 +281,9 @@ static void scsiPrintSeagateCacheLPage(int device)
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(ull)) {
- xp += (k - sizeof(ull));
- k = sizeof(ull);
+ if (k > (int)sizeof(ull)) {
+ xp += (k - (int)sizeof(ull));
+ k = (int)sizeof(ull);
}
ull = 0;
for (j = 0; j < k; ++j) {
@@ -333,9 +333,9 @@ static void scsiPrintSeagateFactoryLPage(int device)
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(ull)) {
- xp += (k - sizeof(ull));
- k = sizeof(ull);
+ if (k > (int)sizeof(ull)) {
+ xp += (k - (int)sizeof(ull));
+ k = (int)sizeof(ull);
}
ull = 0;
for (j = 0; j < k; ++j) {
@@ -629,7 +629,8 @@ static int scsiGetDriveInfo(int device, UINT8 * peripheral_type, int all)
QUIETOFF(con);
}
// print SCSI peripheral device type
- if (peri_dt < (sizeof(peripheral_dt_arr) / sizeof(peripheral_dt_arr[0])))
+ if (peri_dt < (int)(sizeof(peripheral_dt_arr) /
+ sizeof(peripheral_dt_arr[0])))
pout("Device type: %s\n", peripheral_dt_arr[peri_dt]);
else
pout("Device type: <%d>\n", peri_dt);
@@ -803,7 +804,7 @@ static void failuretest(int type, int returnvalue)
}
/* Main entry point used by smartctl command. Return 0 for success */
-int scsiPrintMain(const char *dev_name, int fd)
+int scsiPrintMain(const char * dev_name, int fd)
{
int checkedSupportedLogPages = 0;
UINT8 peripheral_type = 0;
diff --git a/sm5/scsiprint.cpp b/sm5/scsiprint.cpp
index 800020644..2a49e6c84 100644
--- a/sm5/scsiprint.cpp
+++ b/sm5/scsiprint.cpp
@@ -40,7 +40,7 @@
#define GBUF_SIZE 65535
-const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.58 2003/11/15 02:29:16 dpgilbert Exp $"
+const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.59 2003/11/16 12:19:04 dpgilbert Exp $"
EXTERN_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
// control block which points to external global control variables
@@ -281,9 +281,9 @@ static void scsiPrintSeagateCacheLPage(int device)
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(ull)) {
- xp += (k - sizeof(ull));
- k = sizeof(ull);
+ if (k > (int)sizeof(ull)) {
+ xp += (k - (int)sizeof(ull));
+ k = (int)sizeof(ull);
}
ull = 0;
for (j = 0; j < k; ++j) {
@@ -333,9 +333,9 @@ static void scsiPrintSeagateFactoryLPage(int device)
}
k = pl - 4;
xp = ucp + 4;
- if (k > sizeof(ull)) {
- xp += (k - sizeof(ull));
- k = sizeof(ull);
+ if (k > (int)sizeof(ull)) {
+ xp += (k - (int)sizeof(ull));
+ k = (int)sizeof(ull);
}
ull = 0;
for (j = 0; j < k; ++j) {
@@ -629,7 +629,8 @@ static int scsiGetDriveInfo(int device, UINT8 * peripheral_type, int all)
QUIETOFF(con);
}
// print SCSI peripheral device type
- if (peri_dt < (sizeof(peripheral_dt_arr) / sizeof(peripheral_dt_arr[0])))
+ if (peri_dt < (int)(sizeof(peripheral_dt_arr) /
+ sizeof(peripheral_dt_arr[0])))
pout("Device type: %s\n", peripheral_dt_arr[peri_dt]);
else
pout("Device type: <%d>\n", peri_dt);
@@ -803,7 +804,7 @@ static void failuretest(int type, int returnvalue)
}
/* Main entry point used by smartctl command. Return 0 for success */
-int scsiPrintMain(const char *dev_name, int fd)
+int scsiPrintMain(const char * dev_name, int fd)
{
int checkedSupportedLogPages = 0;
UINT8 peripheral_type = 0;
--
GitLab