Changeset 2853

Timestamp:

07/21/09 19:09:49 (4 years ago)

Author:

chrfranke

Message:

smartctl: Fix number of entries in '-l xselftest' output.

Location:

trunk/smartmontools

Files:

• CHANGELOG (modified) (1 diff)
• ataprint.cpp (modified) (2 diffs, 1 prop)

trunk/smartmontools/CHANGELOG

@@ -42 +42 @@
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] smartctl: Fix number of entries in '-l xselftest' output.
+
   [CF] Add USB IDs of a SunplusIT bridge, three WD drives, and an
        unsupported Iomega drive.

trunk/smartmontools/ataprint.cpp

@@ -45 +45 @@
 #include "knowndrives.h"
 
-const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.214 2009/07/07 19:28:29 chrfranke Exp $"
-ATACMDNAMES_H_CVSID ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
+const char * ataprint_cpp_cvsid = "$Id$"
+                                  ATAPRINT_H_CVSID;
 
 // for passing global control variables
@@ -1386 +1386 @@
   logidx--;
 
-  unsigned logcnt = nentries;
-  if (max_entries < logcnt)
-    logcnt = max_entries;
-
   bool print_header = true;
 
   // Iterate through circular buffer in reverse direction
   for (unsigned i = 0, testnum = 1;
-       i < logcnt; i++, logidx = (logidx > 0 ? logidx - 1 : nentries - 1)) {
+       i < nentries && testnum <= max_entries;
+       i++, logidx = (logidx > 0 ? logidx - 1 : nentries - 1)) {
 
     const ata_smart_extselftestlog_desc & entry = log[logidx / 19].log_descs[logidx % 19];