Make xhdr_tab extern, not static.

[chaz/tar] / src / xheader.c

diff --git a/src/xheader.c b/src/xheader.c
index ff046367c4e2dd7cfdaf8aa7dbdf22f53a72b907..1441eec8728b5e14f4d1f5bdcf74737fcea20586 100644 (file)
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -36,7 +36,13 @@ struct xhdr_tab
   void (*decoder) (struct tar_stat_info *, char const *);
 };
 
-static struct xhdr_tab const xhdr_tab[];
+/* This declaration must be extern, because ISO C99 section 6.9.2
+   prohibits a tentative definition that has both internal linkage and
+   incomplete type.  If we made it static, we'd have to declare its
+   size which would be a maintenance pain; if we put its initializer
+   here, we'd need a boatload of forward declarations, which would be
+   even more of a pain.  */
+extern struct xhdr_tab const xhdr_tab[];
 
 static struct xhdr_tab const *
 locate_handler (char const *keyword)
@@ -406,7 +412,7 @@ uname_decoder (struct tar_stat_info *st, char const *arg)
   assign_string (&st->uname, arg);
 }
 
-static struct xhdr_tab const xhdr_tab[] = {
+struct xhdr_tab const xhdr_tab[] = {
   { "atime",   atime_coder,    atime_decoder   },
   { "comment", dummy_coder,    dummy_decoder   },
   { "charset", dummy_coder,    dummy_decoder   },
@@ -420,6 +426,9 @@ static struct xhdr_tab const xhdr_tab[] = {
   { "uid",     uid_coder,      uid_decoder     },
   { "uname",   uname_coder,    uname_decoder   },
 
+  /* The number of entries in xhdr_tab must agree with the array
+     bounds in xhdr_tab's forward declaration.  */
+
 #if 0 /* GNU private keywords (not yet implemented) */
   /* Sparse file handling */
   { "GNU.sparse.offset",     sparse_offset_coder, sparse_offset_decoder },