library: show allowable range in relative enum warning

This patch just trades the 'typestr' for the much more
meaningful 'valid range' when a relative enum has been
deemed invalid under that XTRA_PROCPS_DEBUG provision.

[ and we'll also make one comment a bit more generic ]

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/proc/diskstats.c b/proc/diskstats.c
index 48b43c3a6f111844ffccb07ea7b5d9646d00d83d..4122a2393bda6013d9b733325e366184dd44a7ce 100644 (file)
--- a/proc/diskstats.c
+++ b/proc/diskstats.c
@@ -948,7 +948,7 @@ PROCPS_EXPORT struct diskstats_stack **procps_diskstats_sort (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct diskstats_result *xtra_diskstats_get (
@@ -989,8 +989,8 @@ PROCPS_EXPORT struct diskstats_result *xtra_diskstats_val (
     for (i = 0; stack->head[i].item < DISKSTATS_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;

diff --git a/proc/meminfo.c b/proc/meminfo.c
index 73035877a5a8e3c406d5e904e00eff633f13c442..f51555952a43e366d6f73940e0fa3492deb87932 100644 (file)
--- a/proc/meminfo.c
+++ b/proc/meminfo.c
@@ -925,7 +925,7 @@ PROCPS_EXPORT struct meminfo_stack *procps_meminfo_select (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct meminfo_result *xtra_meminfo_get (
@@ -965,8 +965,8 @@ PROCPS_EXPORT struct meminfo_result *xtra_meminfo_val (
     for (i = 0; stack->head[i].item < MEMINFO_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;

diff --git a/proc/pids.c b/proc/pids.c
index 0822a13310341bd526ee47bdc5ad33b8de2b9b5f..c05743d7236be93571bba9debcf11646a68aaec5 100644 (file)
--- a/proc/pids.c
+++ b/proc/pids.c
@@ -1502,7 +1502,7 @@ PROCPS_EXPORT struct pids_stack **procps_pids_sort (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct pids_result *xtra_pids_val (
@@ -1519,8 +1519,8 @@ PROCPS_EXPORT struct pids_result *xtra_pids_val (
     for (i = 0; stack->head[i].item < PIDS_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;

diff --git a/proc/slabinfo.c b/proc/slabinfo.c
index ff04ec80e7de8ff077ba3cb62a303b5ede3e4c90..2bdb663f982afd367d92c6387773a644b669233d 100644 (file)
--- a/proc/slabinfo.c
+++ b/proc/slabinfo.c
@@ -965,7 +965,7 @@ PROCPS_EXPORT struct slabinfo_stack **procps_slabinfo_sort (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct slabinfo_result *xtra_slabinfo_get (
@@ -1005,8 +1005,8 @@ PROCPS_EXPORT struct slabinfo_result *xtra_slabinfo_val (
     for (i = 0; stack->head[i].item < SLABINFO_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;

diff --git a/proc/stat.c b/proc/stat.c
index 93b23bf433f6c42c7aa7b16d77e27ea2ab11961a..9c5b2012e71e345a8dff63703694c8ba3462d3aa 100644 (file)
--- a/proc/stat.c
+++ b/proc/stat.c
@@ -1152,7 +1152,7 @@ PROCPS_EXPORT struct stat_stack **procps_stat_sort (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct stat_result *xtra_stat_get (
@@ -1192,8 +1192,8 @@ PROCPS_EXPORT struct stat_result *xtra_stat_val (
     for (i = 0; stack->head[i].item < STAT_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;

diff --git a/proc/vmstat.c b/proc/vmstat.c
index 36a892325102bcfc84cf51c8dd888d3cc0008574..5118dd066b6d299dce70809faea1079641fa1fa7 100644 (file)
--- a/proc/vmstat.c
+++ b/proc/vmstat.c
@@ -1355,7 +1355,7 @@ PROCPS_EXPORT struct vmstat_stack *procps_vmstat_select (
  *
  *  It's used only when:
  *      1) the 'XTRA_PROCPS_DEBUG' has been defined, or
- *      2) the '#include <proc/xtra-procps-debug.h>' used
+ *      2) an #include of 'xtra-procps-debug.h' is used
  */
 
 PROCPS_EXPORT struct vmstat_result *xtra_vmstat_get (
@@ -1395,8 +1395,8 @@ PROCPS_EXPORT struct vmstat_result *xtra_vmstat_val (
     for (i = 0; stack->head[i].item < VMSTAT_logical_end; i++)
         ;
     if (relative_enum < 0 || relative_enum >= i) {
-        fprintf(stderr, "%s line %d: invalid relative_enum = %d, type = %s\n"
-            , file, lineno, relative_enum, typestr);
+        fprintf(stderr, "%s line %d: invalid relative_enum = %d, valid range = 0-%d\n"
+            , file, lineno, relative_enum, i-1);
         return NULL;
     }
     str = Item_table[stack->head[relative_enum].item].type2str;