several fixes to make irssi compile without warnings with MIPSpro

also fixed ctcp_queue_clean() - it might have crashed sometimes..


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@859 dbcabf3a-b0e7-0310-adc4-f8d773084564

src/core/channel-rec.h

@@ -7,20 +7,20 @@ char *topic_by;
 time_t topic_time;
 GHashTable *nicks; /* list of nicks */
 
-int no_modes:1; /* channel doesn't support modes */
+unsigned int no_modes:1; /* channel doesn't support modes */
 char *mode;
 int limit; /* user limit */
 char *key; /* password key */
 
-int chanop:1; /* You're a channel operator */
-int names_got:1; /* Received /NAMES list */
-int wholist:1; /* WHO list got */
-int synced:1; /* Channel synced - all queries done */
+unsigned int chanop:1; /* You're a channel operator */
+unsigned int names_got:1; /* Received /NAMES list */
+unsigned int wholist:1; /* WHO list got */
+unsigned int synced:1; /* Channel synced - all queries done */
 
-int joined:1; /* Have we even received JOIN event for this channel? */
-int left:1; /* You just left the channel */
-int kicked:1; /* You just got kicked */
-int destroying:1;
+unsigned int joined:1; /* Have we even received JOIN event for this channel? */
+unsigned int left:1; /* You just left the channel */
+unsigned int kicked:1; /* You just got kicked */
+unsigned int destroying:1;
 
 GSList *lastmsgs; /* List of nicks who last send message */
 GSList *lastownmsgs; /* List of nicks who last send message to you */

src/core/channels-setup.h

@@ -11,7 +11,7 @@ typedef struct {
 	char *botmasks;
 	char *autosendcmd;
 
-	int autojoin:1;
+	unsigned int autojoin:1;
 	GHashTable *module_data;
 } CHANNEL_SETUP_REC;
 

src/core/ignore.c

@@ -100,7 +100,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 				mask_match_address(server, rec->mask, nick, host);
 			if (!ok) {
                                 /* nick didn't match, but maybe this is a reply to nick? */
-				if (!rec->replies || channel == NULL || text == NULL ||
+				if (!rec->replies || chanrec == NULL || text == NULL ||
 				    !ignore_check_replies(rec, chanrec, text))
 					continue;
 			}

src/core/ignore.h

@@ -18,11 +18,11 @@ typedef struct {
 	int time; /* time in sec for temp ignores */
 	int time_tag;
 
-	int regexp:1;
-	int fullword:1;
-	int replies:1; /* ignore replies to nick in channel */
+	unsigned int regexp:1;
+	unsigned int fullword:1;
+	unsigned int replies:1; /* ignore replies to nick in channel */
 #ifdef HAVE_REGEX_H
-	int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
+	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
 	regex_t preg;
 #endif
 } IGNORE_REC;

src/core/log.h

@@ -25,9 +25,9 @@ typedef struct {
 
 	time_t last; /* when last message was written */
 
-	int autoopen:1; /* automatically start logging at startup */
-	int failed:1; /* opening log failed last time */
-	int temp:1; /* don't save this to config file */
+	unsigned int autoopen:1; /* automatically start logging at startup */
+	unsigned int failed:1; /* opening log failed last time */
+	unsigned int temp:1; /* don't save this to config file */
 } LOG_REC;
 
 extern GSList *logs;

src/core/misc.c

@@ -37,7 +37,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
 			   void *data)
 {
 	IRSSI_INPUT_REC *rec = data;
-	GInputCondition icond = 0;
+	GInputCondition icond = (GInputCondition)0;
 
 	if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
 		/* error, we have to call the function.. */
@@ -73,7 +73,7 @@ int g_input_add_full(int source, int priority, GInputCondition condition,
 	rec->function = function;
 	rec->data = data;
 
-	cond = G_IO_ERR|G_IO_HUP|G_IO_NVAL;
+	cond = (GIOCondition) (G_IO_ERR|G_IO_HUP|G_IO_NVAL);
 	if (condition & G_INPUT_READ)
 		cond |= G_IO_IN|G_IO_PRI;
 	if (condition & G_INPUT_WRITE)

src/core/modules.c

@@ -251,7 +251,7 @@ GModule *module_open(const char *name)
 		g_free(str);
 
 		if (stat(path, &statbuf) == 0) {
-			module = g_module_open(path, 0);
+			module = g_module_open(path, (GModuleFlags) 0);
 			g_free(path);
 			return module;
 		}
@@ -260,7 +260,7 @@ GModule *module_open(const char *name)
 		path = g_module_build_path(MODULEDIR, name);
 	}
 
-	module = g_module_open(path, 0);
+	module = g_module_open(path, (GModuleFlags) 0);
 	g_free(path);
 	return module;
 }

src/core/net-nonblock.c

@@ -190,7 +190,8 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, int pipe)
 		return;
 	}
 
-	rec->tag = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE,
+	rec->tag = g_input_add(handle,
+			       (GInputCondition) (G_INPUT_READ|G_INPUT_WRITE),
 			       (GInputFunction) simple_init, rec);
 }
 

src/core/nicklist.h

@@ -13,14 +13,14 @@ typedef struct {
 	int hops;
 
 	/* status in server */
-	int gone:1;
-	int serverop:1;
+	unsigned int gone:1;
+	unsigned int serverop:1;
 
 	/* status in channel */
-	int send_massjoin:1; /* Waiting to be sent in massjoin signal */
-	int op:1;
-	int halfop:1;
-	int voice:1;
+	unsigned int send_massjoin:1; /* Waiting to be sent in massjoin signal */
+	unsigned int op:1;
+	unsigned int halfop:1;
+	unsigned int voice:1;
 } NICK_REC;
 
 /* Add new nick to list */

src/core/query-rec.h

@@ -4,6 +4,6 @@
 
 char *address;
 char *server_tag;
-int unwanted:1; /* TRUE if the other side closed or
-                   some error occured (DCC chats!) */
-int destroying:1;
+unsigned int unwanted:1; /* TRUE if the other side closed or
+			    some error occured (DCC chats!) */
+unsigned int destroying:1;

src/core/server-connect-rec.h

@@ -20,7 +20,7 @@ char *username;
 char *realname;
 
 /* when reconnecting, the old server status */
-int reconnection:1; /* we're trying to reconnect */
+unsigned int reconnection:1; /* we're trying to reconnect */
 char *channels;
 char *away_reason;
 char *usermode;

src/core/server-rec.h

@@ -10,8 +10,8 @@ time_t real_connect_time; /* time when server replied that we really are connect
 char *tag; /* tag name for addressing server */
 char *nick; /* current nick */
 
-int connected:1; /* connected to server */
-int connection_lost:1; /* Connection lost unintentionally */
+unsigned int connected:1; /* connected to server */
+unsigned int connection_lost:1; /* Connection lost unintentionally */
 
 void *handle; /* NET_SENDBUF_REC socket */
 int readtag; /* input tag */
@@ -33,9 +33,9 @@ GHashTable *module_data;
 char *version; /* server version */
 char *away_reason;
 char *last_invite; /* channel where you were last invited */
-int server_operator:1;
-int usermode_away:1;
-int banned:1; /* not allowed to connect to this server */
+unsigned int server_operator:1;
+unsigned int usermode_away:1;
+unsigned int banned:1; /* not allowed to connect to this server */
 
 time_t lag_sent; /* 0 or time when last lag query was sent to server */
 time_t lag_last_check; /* last time we checked lag */

src/core/server-setup-rec.h

@@ -12,8 +12,8 @@ IPADDR *own_ip; /* resolved own_address if not NULL */
 
 time_t last_connect; /* to avoid reconnecting too fast.. */
 
-int autoconnect:1;
-int last_failed:1; /* if last connection attempt failed */
-int banned:1; /* if we're banned from this server */
+unsigned int autoconnect:1;
+unsigned int last_failed:1; /* if last connection attempt failed */
+unsigned int banned:1; /* if we're banned from this server */
 
 GHashTable *module_data;

src/core/servers.c

@@ -200,7 +200,8 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 
 	server->handle = net_sendbuffer_create(handle, 0);
 	server->connect_tag =
-		g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
+		g_input_add(handle,
+			    (GInputCondition) (G_INPUT_WRITE|G_INPUT_READ),
 			    (GInputFunction) server_connect_callback_init,
 			    server);
 	signal_emit("server connecting", 2, server, &iprec.ip);

src/core/settings.c

@@ -76,12 +76,12 @@ const char *settings_get_str(const char *key)
 	return iconfig_get_str("settings", key, settings_get_default_str(key));
 }
 
-const int settings_get_int(const char *key)
+int settings_get_int(const char *key)
 {
 	return iconfig_get_int("settings", key, settings_get_default_int(key));
 }
 
-const int settings_get_bool(const char *key)
+int settings_get_bool(const char *key)
 {
 	return iconfig_get_bool("settings", key,
 				settings_get_default_int(key));

src/core/settings.h

@@ -38,8 +38,8 @@ extern CONFIG_REC *mainconfig;
 
 /* Functions for handling the "settings" node of Irssi configuration */
 const char *settings_get_str(const char *key);
-const int settings_get_int(const char *key);
-const int settings_get_bool(const char *key);
+int settings_get_int(const char *key);
+int settings_get_bool(const char *key);
 
 /* Functions to add/remove settings */
 void settings_add_str(const char *section, const char *key, const char *def);