Fix warnings: -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wmissing-prototypes.

git-svn-id: http://svn.drobilla.net/lad/trunk/sratom@4628 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 29 insertions, 29 deletions

diff --git a/src/sratom.c b/src/sratom.c
index 93b962e..c612843 100644
--- a/src/sratom.c
+++ b/src/sratom.c
@@ -142,7 +142,7 @@ list_append(Sratom*           sratom,
             SerdNode*         node,
             uint32_t          size,
             uint32_t          type,
-            void*             body)
+            const void*       body)
 {
 	// Generate a list node
 	gensym(node, 'l', sratom->next_id);
@@ -229,7 +229,7 @@ sratom_write(Sratom*         sratom,
 		datatype = serd_node_from_string(SERD_URI, NS_XSD "base64Binary");
 		object   = serd_node_new_blob(body, size, true);
 	} else if (type_urid == sratom->forge.Literal) {
-		LV2_Atom_Literal_Body* lit = (LV2_Atom_Literal_Body*)body;
+		const LV2_Atom_Literal_Body* lit = (const LV2_Atom_Literal_Body*)body;
 		const uint8_t*         str = USTR(lit + 1);
 		object = serd_node_from_string(SERD_LITERAL, str);
 		if (lit->datatype) {
@@ -247,8 +247,8 @@ sratom_write(Sratom*         sratom,
 			}
 		}
 	} else if (type_urid == sratom->forge.URID) {
-		const uint32_t id  = *(const uint32_t*)body;
-		const uint8_t* str = USTR(unmap->unmap(unmap->handle, id));
+		const uint32_t urid = *(const uint32_t*)body;
+		const uint8_t* str  = USTR(unmap->unmap(unmap->handle, urid));
 		object = serd_node_from_string(SERD_URI, str);
 	} else if (type_urid == sratom->forge.Path) {
 		const uint8_t* str = USTR(body);
@@ -278,22 +278,22 @@ sratom_write(Sratom*         sratom,
 		object = serd_node_from_string(SERD_URI, str);
 	} else if (type_urid == sratom->forge.Int) {
 		new_node = true;
-		object   = serd_node_new_integer(*(int32_t*)body);
+		object   = serd_node_new_integer(*(const int32_t*)body);
 		datatype = serd_node_from_string(SERD_URI, (sratom->pretty_numbers)
 		                                 ? NS_XSD "integer" : NS_XSD "int");
 	} else if (type_urid == sratom->forge.Long) {
 		new_node = true;
-		object   = serd_node_new_integer(*(int64_t*)body);
+		object   = serd_node_new_integer(*(const int64_t*)body);
 		datatype = serd_node_from_string(SERD_URI, (sratom->pretty_numbers)
 		                                 ? NS_XSD "integer" : NS_XSD "long");
 	} else if (type_urid == sratom->forge.Float) {
 		new_node = true;
-		object   = serd_node_new_decimal(*(float*)body, 8);
+		object   = serd_node_new_decimal(*(const float*)body, 8);
 		datatype = serd_node_from_string(SERD_URI, (sratom->pretty_numbers)
 		                                 ? NS_XSD "decimal" : NS_XSD "float");
 	} else if (type_urid == sratom->forge.Double) {
 		new_node = true;
-		object   = serd_node_new_decimal(*(double*)body, 16);
+		object   = serd_node_new_decimal(*(const double*)body, 16);
 		datatype = serd_node_from_string(SERD_URI, (sratom->pretty_numbers)
 		                                 ? NS_XSD "decimal" : NS_XSD "double");
 	} else if (type_urid == sratom->forge.Bool) {
@@ -307,7 +307,7 @@ sratom_write(Sratom*         sratom,
 		uint8_t* str = (uint8_t*)calloc(size * 2 + 1, 1);
 		for (uint32_t i = 0; i < size; ++i) {
 			snprintf((char*)str + (2 * i), size * 2 + 1, "%02X",
-			         (unsigned)(uint8_t)*((uint8_t*)body + i));
+			         (unsigned)(uint8_t)*((const uint8_t*)body + i));
 		}
 		object = serd_node_from_string(SERD_LITERAL, USTR(str));
 	} else if (type_urid == sratom->atom_Event) {
@@ -352,8 +352,8 @@ sratom_write(Sratom*         sratom,
 		sratom->write_statement(sratom->handle, flags, NULL, &id, &p, &child_type, NULL, NULL);
 		p = serd_node_from_string(SERD_URI, NS_RDF "value");
 		flags |= SERD_LIST_O_BEGIN;
-		for (char* i = (char*)(vec + 1);
-		     i < (char*)vec + size;
+		for (const char* i = (const char*)(vec + 1);
+		     i < (const char*)vec + size;
 		     i += vec->child_size) {
 			list_append(sratom, unmap, &flags, &id, &p, &node,
 			            vec->child_size, vec->child_type, i);
@@ -575,19 +575,19 @@ read_node(Sratom*         sratom,
 		const char* language = sord_node_get_language(node);
 		if (datatype) {
 			const char* type_uri = (const char*)sord_node_get_string(datatype);
-			if (!strcmp(type_uri, (char*)NS_XSD "int") ||
-			    !strcmp(type_uri, (char*)NS_XSD "integer")) {
+			if (!strcmp(type_uri, (const char*)NS_XSD "int") ||
+			    !strcmp(type_uri, (const char*)NS_XSD "integer")) {
 				lv2_atom_forge_int(forge, strtol(str, &endptr, 10));
-			} else if (!strcmp(type_uri, (char*)NS_XSD "long")) {
+			} else if (!strcmp(type_uri, (const char*)NS_XSD "long")) {
 				lv2_atom_forge_long(forge, strtol(str, &endptr, 10));
-			} else if (!strcmp(type_uri, (char*)NS_XSD "float") ||
-			           !strcmp(type_uri, (char*)NS_XSD "decimal")) {
+			} else if (!strcmp(type_uri, (const char*)NS_XSD "float") ||
+			           !strcmp(type_uri, (const char*)NS_XSD "decimal")) {
 				lv2_atom_forge_float(forge, serd_strtod(str, &endptr));
-			} else if (!strcmp(type_uri, (char*)NS_XSD "double")) {
+			} else if (!strcmp(type_uri, (const char*)NS_XSD "double")) {
 				lv2_atom_forge_double(forge, serd_strtod(str, &endptr));
-			} else if (!strcmp(type_uri, (char*)NS_XSD "boolean")) {
+			} else if (!strcmp(type_uri, (const char*)NS_XSD "boolean")) {
 				lv2_atom_forge_bool(forge, !strcmp(str, "true"));
-			} else if (!strcmp(type_uri, (char*)NS_XSD "base64Binary")) {
+			} else if (!strcmp(type_uri, (const char*)NS_XSD "base64Binary")) {
 				size_t size = 0;
 				void*  body = serd_base64_decode(USTR(str), len, &size);
 				lv2_atom_forge_atom(forge, size, forge->Chunk);
diff --git a/tests/sratom_test.c b/tests/sratom_test.c
index 42020b8..f76c246 100644
--- a/tests/sratom_test.c
+++ b/tests/sratom_test.c
@@ -31,7 +31,7 @@
 static char** uris   = NULL;
 static size_t n_uris = 0;
 
-char*
+static char*
 copy_string(const char* str)
 {
 	const size_t len = strlen(str);
@@ -40,7 +40,7 @@ copy_string(const char* str)
 	return dup;
 }
 
-LV2_URID
+static LV2_URID
 urid_map(LV2_URID_Map_Handle handle, const char* uri)
 {
 	for (size_t i = 0; i < n_uris; ++i) {
@@ -54,7 +54,7 @@ urid_map(LV2_URID_Map_Handle handle, const char* uri)
 	return n_uris;
 }
 
-const char*
+static const char*
 urid_unmap(LV2_URID_Unmap_Handle handle,
            LV2_URID              urid)
 {
@@ -64,7 +64,7 @@ urid_unmap(LV2_URID_Unmap_Handle handle,
 	return NULL;
 }
 
-int
+static int
 test_fail(const char* fmt, ...)
 {
 	va_list args;
@@ -75,7 +75,7 @@ test_fail(const char* fmt, ...)
 	return 1;
 }
 
-int
+static int
 test(bool top_level)
 {
 	LV2_URID_Map   map   = { NULL, urid_map };
@@ -234,8 +234,8 @@ test(bool top_level)
 	SerdNode s = serd_node_from_string(SERD_URI, USTR("http://example.org/obj"));
 	SerdNode p = serd_node_from_string(SERD_URI, USTR(NS_RDF "value"));
 
-	SerdNode* subj   = top_level ? NULL : &s;
-	SerdNode* pred   = top_level ? NULL : &p;
+	SerdNode* subj = top_level ? NULL : &s;
+	SerdNode* pred = top_level ? NULL : &p;
 
 	char* outstr = sratom_to_turtle(
 		sratom, &unmap, base_uri, subj, pred,
@@ -245,8 +245,8 @@ test(bool top_level)
 
 	LV2_Atom* parsed = NULL;
 	if (top_level) {
-		SerdNode s = serd_node_from_string(SERD_URI, (const uint8_t*)obj_uri);
-		parsed = sratom_from_turtle(sratom, base_uri, &s, NULL, outstr);
+		SerdNode o= serd_node_from_string(SERD_URI, (const uint8_t*)obj_uri);
+		parsed = sratom_from_turtle(sratom, base_uri, &o, NULL, outstr);
 	} else {
 		parsed = sratom_from_turtle(sratom, base_uri, subj, pred, outstr);
 	}
@@ -281,7 +281,7 @@ test(bool top_level)
 }
 
 int
-main()
+main(void)
 {
 	if (test(false)) {
 		return 1;