From 9ff1daf032fac452de48b5877cef6dc017577e16 Mon Sep 17 00:00:00 2001
From: Tim Stack <timothyshanestack@gmail.com>
Date: Mon, 3 Oct 2022 06:19:07 -0700
Subject: [PATCH] [port] more endianness stuff

---
 src/lnav_util.hh             | 25 +++++++++++--------------
 test/test_text_anonymizer.cc |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/lnav_util.hh b/src/lnav_util.hh
index 75d1fcbb..b8235947 100644
--- a/src/lnav_util.hh
+++ b/src/lnav_util.hh
@@ -104,34 +104,34 @@ public:
         return *this;
     }
 
-    array_t to_array() {
+    array_t to_array()
+    {
+        uint64_t h1;
+        uint64_t h2;
         array_t retval;
 
-        this->h_context.Final(retval.out(0), retval.out(0));
+        this->h_context.Final(&h1, &h2);
+        *retval.out(0) = SPOOKYHASH_LITTLE_ENDIAN_64(h1);
+        *retval.out(1) = SPOOKYHASH_LITTLE_ENDIAN_64(h2);
         return retval;
     }
 
     void to_string(auto_buffer& buf)
     {
-        array_t bits;
+        array_t bits = this->to_array();
 
-        this->h_context.Final(bits.out(0), bits.out(1));
         bits.to_string(std::back_inserter(buf));
     }
 
     std::string to_string()
     {
-        array_t bits;
-
-        this->h_context.Final(bits.out(0), bits.out(1));
+        array_t bits = this->to_array();
         return bits.to_string();
     }
 
     std::string to_uuid_string()
     {
-        array_t bits;
-
-        this->h_context.Final(bits.out(0), bits.out(1));
+        array_t bits = this->to_array();
         return bits.to_uuid_string();
     }
 
@@ -215,10 +215,7 @@ template<typename A>
 struct final_action {  // slightly simplified
     A act;
     final_action(A a) : act{a} {}
-    ~final_action()
-    {
-        act();
-    }
+    ~final_action() { act(); }
 };
 
 template<typename A>
diff --git a/test/test_text_anonymizer.cc b/test/test_text_anonymizer.cc
index cbe0a222..162111fd 100644
--- a/test/test_text_anonymizer.cc
+++ b/test/test_text_anonymizer.cc
@@ -109,7 +109,7 @@ TEST_CASE("hex-dump")
     lnav::text_anonymizer ta;
 
     CHECK(ta.next(string_fragment::from_const("key f2:09:1a:a2"))
-          == "key 2d:20:0d:cc");
+          == "key 68:48:d3:93");
 }
 
 TEST_CASE("cc")