printer lyb BUGFIX count byte order

Author: Roytak

compat/compat.h.in

@@ -96,21 +96,27 @@
     (((val) << 40) & 0x00FF000000000000) | (((val) << 56) & 0xFF00000000000000) )
 #endif
 
+#undef le16toh
 #undef le32toh
 #undef le64toh
+#undef htole16
 #undef htole32
 #undef htole64
 
 #cmakedefine IS_BIG_ENDIAN
 
 #ifdef IS_BIG_ENDIAN
+# define le16toh(x) bswap_16(x)
 # define le32toh(x) bswap_32(x)
 # define le64toh(x) bswap64(x)
+# define htole16(x) bswap_16(x)
 # define htole32(x) bswap_32(x)
 # define htole64(x) bswap64(x)
 #else
+# define le16toh(x) (x)
 # define le32toh(x) (x)
 # define le64toh(x) (x)
+# define htole16(x) (x)
 # define htole32(x) (x)
 # define htole64(x) (x)
 #endif

src/printer_lyb.c

@@ -415,6 +415,7 @@ static LY_ERR
 lyb_write_count(uint32_t count, struct lylyb_print_ctx *lybctx)
 {
     uint8_t prefix_b, num_b, byte_len;
+    uint16_t buf16;
     uint32_t buf;
 
     /* --- no shrink mode --- */
@@ -426,8 +427,8 @@ lyb_write_count(uint32_t count, struct lylyb_print_ctx *lybctx)
 
         /* always write the count on 2 bytes */
         byte_len = 2;
-        buf = htole32(count);
-        return lyb_write(&buf, byte_len * 8, lybctx);
+        buf16 = htole16(count);
+        return lyb_write(&buf16, byte_len * 8, lybctx);
     }
 
     /* --- shrink mode ---
@@ -661,8 +662,8 @@ lyb_print_context_hash(struct lylyb_print_ctx *lybctx)
     if (lybctx->ctx) {
         hash = lyb_truncate_hash_nonzero(ly_ctx_get_modules_hash(lybctx->ctx), LYB_HEADER_CTX_HASH_BITS);
 
-        /* correct byte order */
-        hash = htole32(hash);
+        /* if LYB_HEADER_CTX_HASH_BITS > 9, then we would need to correct the byte order */
+        assert(LYB_HEADER_CTX_HASH_BITS < 9);
     }
 
     return lyb_write(&hash, LYB_HEADER_CTX_HASH_BITS, lybctx);