[PATCH] maint: use consistent widths for comparison of file system constants

[Pádraig Brady]

* src/stat.c (human_fstype): Adjust a couple of existing constants
to be a consistent width so that the src/fs-magic-compare target
works without reporting false positives.
* cfg.mk (sc_fs-magic-compare): A new syntax check to enforce this.
---
 cfg.mk     |    9 +++++++++
 src/stat.c |    4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 66aa55d..f930dae 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -577,6 +577,15 @@ sc_marked_devdiagnostics:
        halt='found marked developer diagnostic(s)'                     \
          $(_sc_search_regexp)
 
+# Ensure we keep hex constants as 4 or 8 bytes for consistency
+# and so that make src/fs-magic-compare works consistently
+sc_fs-magic-compare:
+       @sed -n 's|.*/\* \(0x[0-9A-F]\{1,\}\) .*\*/|\1|p'               \
+         $(srcdir)/src/stat.c                                          \
+         | sed 's/^.\{6\}$$/4 &/; s/^.\{10\}$$/8 &/' | grep '^[^48]'   \
+           && { echo '$(ME): Hex values in src/stat.c should be 4 or 8 bytes' \
+                 1>&2; exit 1; } || :
+
 # Override the default Cc: used in generating an announcement.
 announcement_Cc_ = $(translation_project_), \
   address@hidden, address@hidden
diff --git a/src/stat.c b/src/stat.c
index 7d43eb5..62ec432 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -316,7 +316,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "fusectl";
     case S_MAGIC_FUTEXFS: /* 0x0BAD1DEA local */
       return "futexfs";
-    case S_MAGIC_GFS: /* 0x1161970 remote */
+    case S_MAGIC_GFS: /* 0x01161970 remote */
       return "gfs/gfs2";
     case S_MAGIC_GPFS: /* 0x47504653 remote */
       return "gpfs";
@@ -326,7 +326,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "hfs+";
     case S_MAGIC_HFS_X: /* 0x4858 local */
       return "hfsx";
-    case S_MAGIC_HOSTFS: /* 0xC0FFEE local */
+    case S_MAGIC_HOSTFS: /* 0x00C0FFEE local */
       return "hostfs";
     case S_MAGIC_HPFS: /* 0xF995E849 local */
       return "hpfs";
-- 
1.7.7.6