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

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

3 files changed, 12 insertions, 29 deletions

diff --git a/utils/lilv-bench.c b/utils/lilv-bench.c
index 44c0a79..432e5fd 100644
--- a/utils/lilv-bench.c
+++ b/utils/lilv-bench.c
@@ -20,23 +20,6 @@
 
 #include "lilv_config.h"
 
-void
-print_version(void)
-{
-	printf("lilv_bench (lilv) " LILV_VERSION "\n");
-	printf("Copyright 2011-2011 David Robillard <http://drobilla.net>\n");
-	printf("License: <http://www.opensource.org/licenses/isc-license>\n");
-	printf("This is free software: you are free to change and redistribute it.\n");
-	printf("There is NO WARRANTY, to the extent permitted by law.\n");
-}
-
-void
-print_usage(void)
-{
-	printf("Usage: lilv_bench\n");
-	printf("Load all discovered LV2 plugins.\n");
-}
-
 int
 main(int argc, char** argv)
 {
diff --git a/utils/lv2info.c b/utils/lv2info.c
index 53ad3d9..3dc7a09 100644
--- a/utils/lv2info.c
+++ b/utils/lv2info.c
@@ -41,7 +41,7 @@ LilvNode* preset_class        = NULL;
 LilvNode* designation_pred    = NULL;
 LilvNode* supports_event_pred = NULL;
 
-void
+static void
 print_port(const LilvPlugin* p,
            uint32_t          index,
            float*            mins,
@@ -87,10 +87,10 @@ print_port(const LilvPlugin* p,
 	if (points)
 		printf("\n\t\tScale Points:\n");
 	LILV_FOREACH(scale_points, i, points) {
-		const LilvScalePoint* p = lilv_scale_points_get(points, i);
+		const LilvScalePoint* point = lilv_scale_points_get(points, i);
 		printf("\t\t\t%s = \"%s\"\n",
-				lilv_node_as_string(lilv_scale_point_get_value(p)),
-				lilv_node_as_string(lilv_scale_point_get_label(p)));
+				lilv_node_as_string(lilv_scale_point_get_value(point)),
+				lilv_node_as_string(lilv_scale_point_get_label(point)));
 	}
 	lilv_scale_points_free(points);
 
@@ -140,7 +140,7 @@ print_port(const LilvPlugin* p,
 	lilv_nodes_free(properties);
 }
 
-void
+static void
 print_plugin(LilvWorld*        world,
              const LilvPlugin* p)
 {
@@ -204,9 +204,9 @@ print_plugin(LilvWorld*        world,
 			const char* binary = lilv_node_as_uri(lilv_ui_get_binary_uri(ui));
 
 			const LilvNodes* types = lilv_ui_get_classes(ui);
-			LILV_FOREACH(nodes, i, types) {
+			LILV_FOREACH(nodes, t, types) {
 				printf("\t\t\tClass:  %s\n",
-				       lilv_node_as_uri(lilv_nodes_get(types, i)));
+				       lilv_node_as_uri(lilv_nodes_get(types, t)));
 			}
 
 			if (binary)
@@ -318,7 +318,7 @@ print_plugin(LilvWorld*        world,
 	free(defaults);
 }
 
-void
+static void
 print_version(void)
 {
 	printf(
@@ -329,7 +329,7 @@ print_version(void)
 		"There is NO WARRANTY, to the extent permitted by law.\n");
 }
 
-void
+static void
 print_usage(void)
 {
 	printf(
diff --git a/utils/lv2ls.c b/utils/lv2ls.c
index f77cc28..6f898d5 100644
--- a/utils/lv2ls.c
+++ b/utils/lv2ls.c
@@ -21,7 +21,7 @@
 
 #include "lilv_config.h"
 
-void
+static void
 list_plugins(const LilvPlugins* list, bool show_names)
 {
 	LILV_FOREACH(plugins, i, list) {
@@ -36,7 +36,7 @@ list_plugins(const LilvPlugins* list, bool show_names)
 	}
 }
 
-void
+static void
 print_version(void)
 {
 	printf(
@@ -47,7 +47,7 @@ print_version(void)
 		"There is NO WARRANTY, to the extent permitted by law.\n");
 }
 
-void
+static void
 print_usage(void)
 {
 	printf("Usage: lv2ls [OPTION]...\n");