From: Robert Luberda <robert@debian.org>
Date: Sat, 29 Mar 2008 23:34:00 +0100
Subject: Fix gcc warnings

---
 src/wmgeneral.c | 4 ++--
 src/xmms2cif.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wmgeneral.c b/src/wmgeneral.c
index ee119e0..f6acb2c 100644
--- a/src/wmgeneral.c
+++ b/src/wmgeneral.c
@@ -420,7 +420,7 @@ void drawPartString(char *s, int x, int y, unsigned int s_begin, unsigned int s_
 	unsigned int offset=0;
 	if (strlen(s)<=s_begin || s_begin > s_end){
 		fprintf(stderr,"Your code is shit!\nRepair it!\n");
-		fprintf(stderr,"strlen=%d\ns_begin=%d\ns_end=%d\n",strlen(s),s_begin,s_end);
+		fprintf(stderr,"strlen=%ld\ns_begin=%d\ns_end=%d\n",strlen(s),s_begin,s_end);
 	}
 	while (i < strlen(s)) {
 		offset=i-s_begin;
@@ -445,7 +445,7 @@ void scroller(char *s, int x, int y){
 	static	char		S_HOLD [100];
 	static	unsigned int	s_offset;
 	static	int		start_offset;
-	if(s==NULL || s=="" || s=="\0" || strlen(s)==0 ){
+	if(s==NULL || *s=='\0' ){
 		s=" ";
 		s_offset=0;
 		strcpy(S_HOLD,s);
diff --git a/src/xmms2cif.h b/src/xmms2cif.h
index 3e38efc..502fc40 100644
--- a/src/xmms2cif.h
+++ b/src/xmms2cif.h
@@ -19,7 +19,7 @@ volatile unsigned int STATE;
 #define S_ERROR 99
 
 struct numberinfo {
-	uint length;
+	int32_t length;
 	uint played;
 	char title_info[100];
 };
