From: Max Kellermann <max@duempel.org>
Date: Thu, 25 Sep 2008 19:24:58 +0000 (+0200)
Subject: fix miscellaneous sparse warnings
X-Git-Tag: v0.12_alpha1~141
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=728309e4aeaac71555ce68ffcd3ff92952a270d3;p=ncmpc.git

fix miscellaneous sparse warnings

Static variables, pointers vs integers, void function returning, ...
---

diff --git a/src/main.c b/src/main.c
index a33643d..02b1680 100644
--- a/src/main.c
+++ b/src/main.c
@@ -454,4 +454,6 @@ main(int argc, const char *argv[])
 
 	exit_and_cleanup();
 	ncu_deinit();
+
+	return 0;
 }
diff --git a/src/screen.c b/src/screen.c
index 9c7ca50..526f091 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -558,7 +558,7 @@ screen_update(mpdclient_t *c)
 	static int dbupdate = -1;
 
 	if( !screen.painted )
-		return screen_paint(c);
+		screen_paint(c);
 
 	/* print a message if mpd status has changed */
 	if (c->status != NULL) {
diff --git a/src/str_pool.c b/src/str_pool.c
index 74839b5..3313b3c 100644
--- a/src/str_pool.c
+++ b/src/str_pool.c
@@ -31,7 +31,7 @@ struct slot {
 	char value[1];
 } __attribute__((packed));
 
-struct slot *slots[NUM_SLOTS];
+static struct slot *slots[NUM_SLOTS];
 
 static inline unsigned
 calc_hash(const char *p)
diff --git a/src/wreadln.c b/src/wreadln.c
index dc1dfe8..cc70389 100644
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -334,7 +334,7 @@ _wreadln(WINDOW *w,
 			if (key >= 32) {
 				if (strlen (line + cursor)) { /* if the cursor is */
 					/* not at the last pos */
-					gchar *tmp = 0;
+					gchar *tmp = NULL;
 					gsize size = strlen(line + cursor) + 1;
 
 					tmp = g_malloc0(size);