util: Fix le128_to_cpu on big-endian

We currently have a bug when converting from le128, as we'll overwrite
words that we later need to read.

Also, use an if rather than #ifdef, so the BE case can be compiled.
Turns out we need the ccan headers for this.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

diff --git a/tests/meson.build b/tests/meson.build
index 1ce6463a4c1bbfdbec732ff004f2b2bf869d50db..40632b2ae0878ea27785ad415d41832910408c31 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -52,6 +52,7 @@ endif
 test_uint128 = executable(
     'test-uint128',
     ['test-uint128.c', '../util/types.c'],
+    include_directories: [incdir, '..'],
     dependencies: [libuuid_dep],
 )
 

diff --git a/util/types.c b/util/types.c
index d5de2f2768b899dfc0281755f9986ab4ccef3a5e..fd8113c4558543117347ff2da0ffa5f84ba202c9 100644 (file)
--- a/util/types.c
+++ b/util/types.c
@@ -4,20 +4,25 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <ccan/endian/endian.h>
+
 #include "types.h"
 
 nvme_uint128_t le128_to_cpu(__u8 *data)
 {
        nvme_uint128_t u;
 
-       memcpy(u.bytes, data, 16);
+       if (HAVE_BIG_ENDIAN) {
+               nvme_uint128_t tmp;
+               memcpy(tmp.bytes, data, 16);
+               u.words[0] = le32_to_cpu(tmp.words[3]);
+               u.words[1] = le32_to_cpu(tmp.words[2]);
+               u.words[2] = le32_to_cpu(tmp.words[1]);
+               u.words[3] = le32_to_cpu(tmp.words[0]);
+       } else {
+               memcpy(u.bytes, data, 16);
+       }
 
-#if HAVE_BIG_ENDIAN
-       u.words[0] = le32_to_cpu(u.words[3]);
-       u.words[1] = le32_to_cpu(u.words[2]);
-       u.words[2] = le32_to_cpu(u.words[1]);
-       u.words[3] = le32_to_cpu(u.words[0]);
-#endif
        return u;
 }