From 5d0befa7dd144fc242a96c8bfa4f9233306f2c21 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 7 Jan 2019 20:40:44 +0100
Subject: Fix MSVC warnings about integer literal conversions

---
 src/model.c  |  6 +++---
 src/n3.c     |  6 +++---
 src/reader.c |  2 +-
 src/serdi.c  | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/model.c b/src/model.c
index 15234e45..3de53c9f 100644
--- a/src/model.c
+++ b/src/model.c
@@ -111,9 +111,9 @@ serd_model_best_index(const SerdModel* model,
 {
 	const bool graph_search = (pat[SERD_GRAPH] != 0);
 
-	const unsigned sig = ((pat[0] ? 1 : 0) * 0x100 +
-	                      (pat[1] ? 1 : 0) * 0x010 +
-	                      (pat[2] ? 1 : 0) * 0x001);
+	const unsigned sig = ((pat[0] ? 1U : 0U) * 0x100 +
+	                      (pat[1] ? 1U : 0U) * 0x010 +
+	                      (pat[2] ? 1U : 0U) * 0x001);
 
 	SerdOrder good[2] = { (SerdOrder)-1, (SerdOrder)-1 };
 
diff --git a/src/n3.c b/src/n3.c
index fe11bcfe..ac217c18 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -108,17 +108,17 @@ read_UCHAR(SerdReader* reader, SerdNode* dest, uint32_t* char_code)
 	uint32_t c = code;
 	switch (size) {
 	case 4:
-		buf[3] = 0x80 | (uint8_t)(c & 0x3F);
+		buf[3] = 0x80U | (uint8_t)(c & 0x3F);
 		c >>= 6;
 		c |= (16 << 12);  // set bit 4
         // fallthru
 	case 3:
-		buf[2] = 0x80 | (uint8_t)(c & 0x3F);
+		buf[2] = 0x80U | (uint8_t)(c & 0x3F);
 		c >>= 6;
 		c |= (32 << 6);  // set bit 5
         // fallthru
 	case 2:
-		buf[1] = 0x80 | (uint8_t)(c & 0x3F);
+		buf[1] = 0x80U | (uint8_t)(c & 0x3F);
 		c >>= 6;
 		c |= 0xC0;  // set bits 6 and 7
         // fallthru
diff --git a/src/reader.c b/src/reader.c
index 8b79e2e0..c685060d 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -267,7 +267,7 @@ serd_reader_start_file(SerdReader* reader, const char* uri, bool bulk)
 		(SerdStreamCloseFunc)fclose,
 		fd,
 		name,
-		bulk ? SERD_PAGE_SIZE : 1);
+		bulk ? SERD_PAGE_SIZE : 1U);
 	serd_node_free(name);
 	return st;
 }
diff --git a/src/serdi.c b/src/serdi.c
index 9a1a1848..ce76b88d 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -210,13 +210,13 @@ main(int argc, char** argv)
 	SerdWorld* world  = serd_world_new();
 	SerdEnv*   env    = serd_env_new(base);
 
-	const SerdWriterFlags writer_flags = (ascii ? SERD_STYLE_ASCII : 0);
+	const SerdWriterFlags writer_flags = (ascii ? SERD_STYLE_ASCII : 0U);
 
 	const SerdSerialisationFlags serialisation_flags =
-		no_inline ? SERD_NO_INLINE_OBJECTS : 0;
+		no_inline ? SERD_NO_INLINE_OBJECTS : 0U;
 
 	SerdByteSink* byte_sink = serd_byte_sink_new(
-		(SerdWriteFunc)fwrite, out_fd, bulk_write ? 4096 : 1);
+		(SerdWriteFunc)fwrite, out_fd, bulk_write ? 4096U : 1U);
 
 	SerdWriter* writer = serd_writer_new(world,
 	                                     output_syntax,
@@ -231,8 +231,8 @@ main(int argc, char** argv)
 	const SerdSink* sink     = NULL;
 	if (use_model) {
 		const SerdModelFlags flags =
-		        SERD_INDEX_SPO | (input_has_graphs ? SERD_INDEX_GRAPHS : 0) |
-		        (no_inline ? 0 : SERD_INDEX_OPS);
+		        SERD_INDEX_SPO | (input_has_graphs ? SERD_INDEX_GRAPHS : 0U) |
+		        (no_inline ? 0U : SERD_INDEX_OPS);
 		model    = serd_model_new(world, flags);
 		inserter = serd_inserter_new(model, env, NULL);
 		sink     = serd_inserter_get_sink(inserter);
-- 
cgit v1.2.1