From 69a753b43fd0804144451508779368ab7e840b53 Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Thu, 20 Nov 2003 03:08:16 +0000
Subject: [PATCH] Spelling
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1269 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/smartd.c | 9 ++++-----
sm5/smartd.cpp | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 49c11aa0c..02d695a54 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -65,7 +65,7 @@
extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid,
*knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.247 2003/11/20 01:04:54 dpgilbert Exp $"
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.248 2003/11/20 03:08:16 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -1006,7 +1006,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
else if (SIMPLE_ERR_NO_MEDIUM == err)
PrintOut(LOG_INFO, "Device: %s, NO MEDIUM present; skip device\n", device);
else if (SIMPLE_ERR_BECOMING_READY == err)
- PrintOut(LOG_INFO, "Device: %s, becoming(but not yet) reading; skip device\n", device);
+ PrintOut(LOG_INFO, "Device: %s, BECOMING (but not yet) READY; skip device\n", device);
else
PrintOut(LOG_CRIT, "Device: %s, failed Test Unit Ready [err=%d]\n", device, err);
CloseDevice(fd, device);
@@ -1019,8 +1019,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
// that various USB devices that malform the response will lock up
// if asked for a log page (e.g. temperature) so it is best to
// bail out now.
- err = scsiFetchIECmpage(fd, &iec, cfg->modese_len);
- if (0 == err)
+ if (!(err = scsiFetchIECmpage(fd, &iec, cfg->modese_len)))
cfg->modese_len = iec.modese_len;
else if (SIMPLE_ERR_BAD_FIELD == err)
; /* continue since it is reasonable not to support IE mpage */
@@ -1031,7 +1030,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
CloseDevice(fd, device);
return 3;
}
-
+
// N.B. The following is passive (i.e. it doesn't attempt to turn on
// smart if it is off). This may change to be the same as the ATA side.
if (!scsi_IsExceptionControlEnabled(&iec)) {
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index b59da5d19..f5a202544 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -65,7 +65,7 @@
extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid,
*knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.247 2003/11/20 01:04:54 dpgilbert Exp $"
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.248 2003/11/20 03:08:16 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -1006,7 +1006,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
else if (SIMPLE_ERR_NO_MEDIUM == err)
PrintOut(LOG_INFO, "Device: %s, NO MEDIUM present; skip device\n", device);
else if (SIMPLE_ERR_BECOMING_READY == err)
- PrintOut(LOG_INFO, "Device: %s, becoming(but not yet) reading; skip device\n", device);
+ PrintOut(LOG_INFO, "Device: %s, BECOMING (but not yet) READY; skip device\n", device);
else
PrintOut(LOG_CRIT, "Device: %s, failed Test Unit Ready [err=%d]\n", device, err);
CloseDevice(fd, device);
@@ -1019,8 +1019,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
// that various USB devices that malform the response will lock up
// if asked for a log page (e.g. temperature) so it is best to
// bail out now.
- err = scsiFetchIECmpage(fd, &iec, cfg->modese_len);
- if (0 == err)
+ if (!(err = scsiFetchIECmpage(fd, &iec, cfg->modese_len)))
cfg->modese_len = iec.modese_len;
else if (SIMPLE_ERR_BAD_FIELD == err)
; /* continue since it is reasonable not to support IE mpage */
@@ -1031,7 +1030,7 @@ static int SCSIDeviceScan(cfgfile *cfg) {
CloseDevice(fd, device);
return 3;
}
-
+
// N.B. The following is passive (i.e. it doesn't attempt to turn on
// smart if it is off). This may change to be the same as the ATA side.
if (!scsi_IsExceptionControlEnabled(&iec)) {
--
GitLab