Starting sysstat-12.5.4

[sysstat] / tapestat.h

diff --git a/tapestat.h b/tapestat.h
index 97a507b037b46c9d77ea368e6aa800afe5262493..b611910dbe8ff91668e7dbba725f38489c758618 100644 (file)
--- a/tapestat.h
+++ b/tapestat.h
@@ -2,13 +2,15 @@
  * tapestat: report tape statistics
  * (C) 2015 Hewlett-Packard Development Company, L.P.
  * 
- * Initial revision by Shane M. SEYMOUR (shane.seymour <at> hp.com)
+ * Initial revision by Shane M. SEYMOUR (shane.seymour <at> hpe.com)
  * Modified for sysstat by Sebastien GODARD (sysstat <at> orange.fr)
  */
 
 #ifndef _TAPESTAT_H
 #define _TAPESTAT_H
 
+#include "common.h"
+
 /* T_: tapestat - D_: Display - F_: Flag */
 #define T_D_TIMESTAMP          0x00001
 #define T_D_KILOBYTES          0x00002
@@ -16,6 +18,7 @@
 #define T_D_OMIT_SINCE_BOOT    0x00008
 #define T_D_ISO                        0x00010
 #define T_D_ZERO_OMIT          0x00020
+#define T_D_UNIT               0x00040
 
 #define DISPLAY_TIMESTAMP(m)           (((m) & T_D_TIMESTAMP)       == T_D_TIMESTAMP)
 #define DISPLAY_KILOBYTES(m)           (((m) & T_D_KILOBYTES)       == T_D_KILOBYTES)
@@ -23,22 +26,24 @@
 #define DISPLAY_OMIT_SINCE_BOOT(m)     (((m) & T_D_OMIT_SINCE_BOOT) == T_D_OMIT_SINCE_BOOT)
 #define DISPLAY_ISO(m)                 (((m) & T_D_ISO)             == T_D_ISO)
 #define DISPLAY_ZERO_OMIT(m)           (((m) & T_D_ZERO_OMIT)       == T_D_ZERO_OMIT)
-
+#define DISPLAY_UNIT(m)                        (((m) & T_D_UNIT)            == T_D_UNIT)
 
 #define TAPE_STATS_VALID 1
 #define TAPE_STATS_INVALID 0
 
-#define SYSFS_CLASS_TAPE_DIR "/sys/class/scsi_tape"
-#define TAPE_STAT_PATH "/sys/class/scsi_tape/st%i/stats/"
+#define SYSFS_CLASS_TAPE_DIR   PRE "/sys/class/scsi_tape"
+#define TAPE_STAT_PATH         PRE "/sys/class/scsi_tape/st%i/stats/"
 
-#define TAPE_STAT_FILE_VAL(A, B)                               \
-       snprintf(filename, MAXPATHLEN, A, i);                   \
-       if ((fp = fopen(filename, "r")) != NULL) {              \
-               fscanf(fp, "%"PRId64, &tape_new_stats[i].B);    \
-               fclose(fp);                                     \
-       } else {                                                \
-               tape_new_stats[i].valid = TAPE_STATS_INVALID;   \
-               continue;                                       \
+#define TAPE_STAT_FILE_VAL(A, B)                                       \
+       snprintf(filename, MAXPATHLEN, A, i);                           \
+       if ((fp = fopen(filename, "r")) != NULL) {                      \
+               if (fscanf(fp, "%"PRId64, &tape_new_stats[i].B) != 1) { \
+                       tape_new_stats[i].valid = TAPE_STATS_INVALID;   \
+               }                                                       \
+               fclose(fp);                                             \
+       } else {                                                        \
+               tape_new_stats[i].valid = TAPE_STATS_INVALID;           \
+               continue;                                               \
        }