rsys

commit 9d08bbfbdfcb55d26bd3c70433c6a5ad297007b2
parent ae59763fce2c892f2d28462dbbc1637b4ccde088
Author: vaplv <vaplv@free.fr>
Date:   Sat, 12 Sep 2020 18:07:09 +0200

Fix warnings and errors on CL compiler

Diffstat:
M
src/endianness.h
 | 
4
+---
M
src/hash.c
 | 
4
++--
M
src/test_hash_sha256.c
 | 
13
+++++++------
M
src/test_text_reader.c
 | 
9
++++++---

4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/endianness.h b/src/endianness.h
@@ -23,7 +23,7 @@
   #define LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
   #define BIG_ENDIAN __ORDER_BIG_ENDIAN__
   #include <byteswap.h>
-#elif
+#elif defined(COMPILER_CL)
   #include <Windows.h>
   #define BYTE_ORDER REG_DWORD
   #define LITTLE_ENDIAN REG_DWORD_LITTLE_ENDIAN
@@ -57,8 +57,6 @@ byte_swap_32(const uint32_t ui)
 static FINLINE uint64_t
 byte_swap_64(const uint64_t ui)
 {
-  STATIC_ASSERT(sizeof(unsigned long) == sizeof(uint64_t),
-    Unexpected_sizeof_ulong);
   return _byteswap_uint64(ui);
 }
 #endif
diff --git a/src/hash.c b/src/hash.c
@@ -66,10 +66,10 @@ create_msg
   memcpy(msg, data, len);
 
   /* Setup the '1' bit that marks the end of the msg */
-  msg[len] = (char)0x80;
+  msg[len] = (char)0x80u;
   /* Clean up the bytes after the msg up to the last 8 bytes */
   memset(msg+len+1, 0, msg_sz - len - 1 - 8);
-  /* Store the message 8*len in bug endian */
+  /* Store the message 8*len in big endian */
   *(uint64_t*)(msg+msg_sz-8) = big_endian_64(len*8);
 
 exit:
diff --git a/src/test_hash_sha256.c b/src/test_hash_sha256.c
@@ -44,7 +44,8 @@ main(int argc, char** argv)
   char* data = NULL;
   (void)argc, (void)argv;
 
-  CHK(data = mem_alloc(0x6000003e));
+  data = mem_alloc(0x6000003e);
+  CHK(data);
 
   data[0] = '\0';
   chk_hash(data, 0,
@@ -58,14 +59,14 @@ main(int argc, char** argv)
   chk_hash(data, strlen(data),
     "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
 
-  data[0] = (char)0xbd;
+  data[0] = (char)0xbdu;
   chk_hash(data, 1,
     "68325720aabd7c82f30f554b313d0570c95accbb7dc4b5aae11204c08ffe732b");
 
-  data[0] = (char)0xc9;
-  data[1] = (char)0x8c;
-  data[2] = (char)0x8e;
-  data[3] = (char)0x55;
+  data[0] = (char)0xc9u;
+  data[1] = (char)0x8cu;
+  data[2] = (char)0x8eu;
+  data[3] = (char)0x55u;
   chk_hash(data, 4,
     "7abc22c0ae5af26ce93dbb94433a0e0b2e119d014f8e7f65bd56c61ccccd9504");
 
diff --git a/src/test_text_reader.c b/src/test_text_reader.c
@@ -77,7 +77,8 @@ main(int argc, char** argv)
   mem_init_proxy_allocator(&allocator, &mem_default_allocator);
 
   /* Write the text into a stream */
-  CHK(stream = fopen(filename, "w+"));
+  stream = fopen(filename, "w+");
+  CHK(stream);
   FOR_EACH(i, 0, nlines) {
     const size_t len = strlen(text[i]);
     CHK(fwrite(text[i], 1, len, stream) == len);
@@ -102,7 +103,8 @@ main(int argc, char** argv)
   check_text_reader(txtrdr);
   txtrdr_ref_put(txtrdr);
 
-  CHK(stream = freopen(filename, "w+", stream));
+  stream = freopen(filename, "w+", stream);
+  CHK(stream);
   fprintf(stream, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   fprintf(stream, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
   rewind(stream);
@@ -110,7 +112,8 @@ main(int argc, char** argv)
   CHK(txtrdr_read_line(txtrdr) == RES_OK);
   txtrdr_ref_put(txtrdr);
 
-  CHK(stream = freopen(filename, "w+", stream));
+  stream = freopen(filename, "w+", stream);
+  CHK(stream);
   fprintf(stream, "\r\n");
   rewind(stream);
   CHK(txtrdr_stream(&allocator, stream, filename, '#', &txtrdr) == RES_OK);