From e426aee95b616778e4a8e484c3a56c691a2b9c52 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Fri, 21 Apr 2017 18:32:02 -0700
Subject: Un-inline get/set_metatdata_chksum

Each was only really used in one place, they had some strange return types,
and recent versions of clang on OS X would refuse to compile with

erasurecode_helpers.c:531:26: error: taking address of packed member 'metadata_chksum' of
      class or structure 'fragment_header_s' may result in an unaligned pointer value
      [-Werror,-Waddress-of-packed-member]
    return (uint32_t *) &header->metadata_chksum;
                         ^~~~~~~~~~~~~~~~~~~~~~~

We don't really *care* about the pointer; we just want the value!

Change-Id: I8a5e42312948a75f5dd8b23b6f5ccfa7bd22eb1d
---
 src/erasurecode.c                | 17 +++++++++-------
 src/erasurecode_helpers.c        | 43 ----------------------------------------
 src/erasurecode_postprocessing.c | 13 +++++++++++-
 3 files changed, 22 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/erasurecode.c b/src/erasurecode.c
index 20da457..59e6d60 100644
--- a/src/erasurecode.c
+++ b/src/erasurecode.c
@@ -26,8 +26,8 @@
  * vi: set noai tw=79 ts=4 sw=4:
  */
 
+#include <assert.h>
 #include <zlib.h>
-#include "assert.h"
 #include "list.h"
 #include "erasurecode.h"
 #include "erasurecode_backend.h"
@@ -1093,7 +1093,7 @@ out:
 
 int is_invalid_fragment_header(fragment_header_t *header)
 {
-    uint32_t *stored_csum = NULL, csum = 0;
+    uint32_t csum = 0;
     assert (NULL != header);
     if (header->libec_version == 0)
         /* libec_version must be bigger than 0 */
@@ -1101,17 +1101,20 @@ int is_invalid_fragment_header(fragment_header_t *header)
     if (header->libec_version < _VERSION(1,2,0))
         /* no metadata checksum support */
         return 0;
-    stored_csum = get_metadata_chksum((char *) header);
-    if (NULL == stored_csum)
-        return 1; /* can't verify, possibly crc32 call error */
+
+    if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
+        log_error("Invalid fragment header (get meta chksum)!");
+        return 1;
+    }
+
     csum = crc32(0, (unsigned char *) &header->meta, sizeof(fragment_metadata_t));
-    if (*stored_csum == csum) {
+    if (header->metadata_chksum == csum) {
         return 0;
     }
     // Else, try again with our "alternative" crc32; see
     // https://bugs.launchpad.net/liberasurecode/+bug/1666320
     csum = liberasurecode_crc32_alt(0, &header->meta, sizeof(fragment_metadata_t));
-    return (*stored_csum != csum);
+    return (header->metadata_chksum != csum);
 }
 
 int liberasurecode_verify_fragment_metadata(ec_backend_t be,
diff --git a/src/erasurecode_helpers.c b/src/erasurecode_helpers.c
index 4a49786..1494587 100644
--- a/src/erasurecode_helpers.c
+++ b/src/erasurecode_helpers.c
@@ -501,46 +501,3 @@ inline uint32_t* get_chksum(char *buf)
 }
 
 /* ==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~== */
-
-#if LIBERASURECODE_VERSION >= _VERSION(1,2,0)
-inline int set_metadata_chksum(char *buf)
-{
-    fragment_header_t* header = (fragment_header_t*) buf;
-
-    assert(NULL != header);
-    if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        log_error("Invalid fragment header (set meta chksum)!\n");
-        return -1;
-    }
-
-    header->metadata_chksum = crc32(0, (unsigned char *) &header->meta,
-                                    sizeof(fragment_metadata_t));
-    return 0;
-}
-
-inline uint32_t* get_metadata_chksum(char *buf)
-{
-    fragment_header_t* header = (fragment_header_t*) buf;
-
-    assert(NULL != header);
-    if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        log_error("Invalid fragment header (get meta chksum)!");
-        return NULL;
-    }
-
-    return (uint32_t *) &header->metadata_chksum;
-}
-#else
-inline int set_metadata_chksum(char *buf)
-{
-    return 0;
-}
-
-inline uint32_t* get_metadata_chksum(char *buf)
-{
-    return (uint32_t *) 0;
-}
-#endif
-
-/* ==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~== */
-
diff --git a/src/erasurecode_postprocessing.c b/src/erasurecode_postprocessing.c
index 7d121d4..07c08f5 100644
--- a/src/erasurecode_postprocessing.c
+++ b/src/erasurecode_postprocessing.c
@@ -26,9 +26,11 @@
  * vi: set noai tw=79 ts=4 sw=4:
  */
 
+#include <zlib.h>
 #include "erasurecode_backend.h"
 #include "erasurecode_helpers.h"
 #include "erasurecode_helpers_ext.h"
+#include "erasurecode_log.h"
 #include "erasurecode_stdinc.h"
 
 void add_fragment_metadata(ec_backend_t be, char *fragment,
@@ -49,7 +51,16 @@ void add_fragment_metadata(ec_backend_t be, char *fragment,
     if (add_chksum) {
         set_checksum(ct, fragment, blocksize);
     }
-    set_metadata_chksum(fragment);
+
+    fragment_header_t* header = (fragment_header_t*) fragment;
+
+    if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
+        log_error("Invalid fragment header (add fragment metadata)!\n");
+        return;
+    }
+
+    header->metadata_chksum = crc32(0, (unsigned char *) &header->meta,
+                                    sizeof(fragment_metadata_t));
 }
 
 int finalize_fragments_after_encode(ec_backend_t instance,
-- 
cgit v1.2.1