Yet another round of enum-as-function-argument elimination

- Pass the yes/no magic argument to headerRead(), headerWrite() and
  headerSizeof() as int instead of enum.

diff --git a/lib/header.c b/lib/header.c
index 45dbbe9..144ed9b 100644 (file)
--- a/lib/header.c
+++ b/lib/header.c
@@ -248,7 +248,7 @@ void headerUnsort(Header h)
     qsort(h->index, h->indexUsed, sizeof(*h->index), offsetCmp);
 }
 
-unsigned headerSizeof(Header h, enum hMagic magicp)
+unsigned headerSizeof(Header h, int magicp)
 {
     indexEntry entry;
     unsigned int size = 0;
@@ -961,7 +961,7 @@ Header headerCopyLoad(const void * uh)
  * @param magicp       read (and verify) 8 bytes of (magic, 0)?
  * @return             header (or NULL on error)
  */
-Header headerRead(FD_t fd, enum hMagic magicp)
+Header headerRead(FD_t fd, int magicp)
 {
     int32_t block[4];
     int32_t reserved;
@@ -1018,7 +1018,7 @@ exit:
     return h;
 }
 
-int headerWrite(FD_t fd, Header h, enum hMagic magicp)
+int headerWrite(FD_t fd, Header h, int magicp)
 {
     ssize_t nb;
     size_t length;

diff --git a/lib/header.h b/lib/header.h
index b39f57a..a9160fc 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -72,7 +72,7 @@ void headerUnsort(Header h);
  * @param magicp       include size of 8 bytes for (magic, 0)?
  * @return             size of on-disk header
  */
-unsigned int headerSizeof(Header h, enum hMagic magicp);
+unsigned int headerSizeof(Header h, int magicp);
 
 /** \ingroup header
  * Perform simple sanity and range checks on header tag(s).
@@ -128,7 +128,7 @@ Header headerCopyLoad(const void * uh);
  * @param magicp       read (and verify) 8 bytes of (magic, 0)?
  * @return             header (or NULL on error)
  */
-Header headerRead(FD_t fd, enum hMagic magicp);
+Header headerRead(FD_t fd, int magicp);
 
 /** \ingroup header
  * Write (with unload) header to file handle.
@@ -137,7 +137,7 @@ Header headerRead(FD_t fd, enum hMagic magicp);
  * @param magicp       prefix write with 8 bytes of (magic, 0)?
  * @return             0 on success, 1 on error
  */
-int headerWrite(FD_t fd, Header h, enum hMagic magicp);
+int headerWrite(FD_t fd, Header h, int magicp);
 
 /** \ingroup header
  * Check if tag is in header.