1.1 --- a/src/client/server.c	Sat Dec 31 15:21:12 2011 +0200
     1.2 +++ b/src/client/server.c	Sat Dec 31 15:25:03 2011 +0200
     1.3 @@ -127,10 +127,8 @@
     1.4  		/* next parameter is the failure name */
     1.5  		failure_name = args;
     1.6  		args = strchr(failure_name, EVENT_STRING_SEPARATOR);
     1.7 -		if (args == NULL)
     1.8 -			args = failure_name + strlen(failure_name);
     1.9 -		else
    1.10 -			*args++ = '\0';
    1.11 +		if (args != NULL)
    1.12 +			*args = '\0';
    1.13  		event_add_control(event, server_reply_failure_id,
    1.14  			p_strdup(event_get_pool(event), failure_name));
    1.15  		break;

     2.1 --- a/src/client/text-buffer-window.c	Sat Dec 31 15:21:12 2011 +0200
     2.2 +++ b/src/client/text-buffer-window.c	Sat Dec 31 15:25:03 2011 +0200
     2.3 @@ -51,7 +51,6 @@
     2.4  			x++;
     2.5  		else {
     2.6  			/* wrap the line from last whitespace, if is are any. */
     2.7 -			x = 0;
     2.8  			height++;
     2.9  
    2.10  			if (last_space == NULL) {

     3.1 --- a/src/lib/event-filter.c	Sat Dec 31 15:21:12 2011 +0200
     3.2 +++ b/src/lib/event-filter.c	Sat Dec 31 15:25:03 2011 +0200
     3.3 @@ -44,7 +44,6 @@
     3.4  
     3.5  	filter = event_filter_init();
     3.6  
     3.7 -	key = str;
     3.8  	for (; *str != '\0'; str++) {
     3.9  		if (*str == ')') {
    3.10  			if (filter->type == EVENT_FILTER_NOT &&
    3.11 @@ -195,7 +194,8 @@
    3.12  {
    3.13  	struct event_filter *tmp;
    3.14  	const char *value = NULL;
    3.15 -	int ret, partial_matches;
    3.16 +	int ret;
    3.17 +	bool partial_matches;
    3.18  
    3.19  	if (filter->key != NULL) {
    3.20  		for (; *args != NULL; args += 2) {
    3.21 @@ -288,8 +288,6 @@
    3.22  			return -1;
    3.23  		return 0;
    3.24  	case EVENT_FILTER_NOT:
    3.25 -		partial_matches = FALSE;
    3.26 -
    3.27  		i_assert(filter->first_child != NULL);
    3.28  		i_assert(filter->first_child->next == NULL);
    3.29  

     4.1 --- a/src/lib/tree.c	Sat Dec 31 15:21:12 2011 +0200
     4.2 +++ b/src/lib/tree.c	Sat Dec 31 15:25:03 2011 +0200
     4.3 @@ -353,12 +353,10 @@
     4.4  
     4.5  static struct tree_node *tree_node_rotate_left(struct tree_node *node)
     4.6  {
     4.7 -	struct tree_node *left;
     4.8  	struct tree_node *right;
     4.9  	int a_bal;
    4.10  	int b_bal;
    4.11  
    4.12 -	left = node->left;
    4.13  	right = node->right;
    4.14  
    4.15  	node->right = right->left;

     5.1 --- a/src/server/cmd/cmd-channel.c	Sat Dec 31 15:21:12 2011 +0200
     5.2 +++ b/src/server/cmd/cmd-channel.c	Sat Dec 31 15:25:03 2011 +0200
     5.3 @@ -242,7 +242,6 @@
     5.4  static void cmd_channel_names(struct event *event)
     5.5  {
     5.6  	const char *channel_name = event_get(event, EVENT_KEY_CHANNEL_NAME);
     5.7 -	struct local_presence *local_presence;
     5.8  	struct presence *presence;
     5.9  	struct channel_connection *channel_conn;
    5.10  	struct event *reply;
    5.11 @@ -264,7 +263,6 @@
    5.12  	}
    5.13  	event_add_control(event, channel_conn, channel_conn);
    5.14  
    5.15 -	local_presence = presence->gwconn->local_presence;
    5.16  	iter = tree_iterate_init(channel_conn->presences, NULL, TRUE);
    5.17  	while (tree_iterate(iter, &key, &value)) {
    5.18  		struct channel_presence *channel_presence = value;

     6.1 --- a/src/server/cmd/cmd-event.c	Sat Dec 31 15:21:12 2011 +0200
     6.2 +++ b/src/server/cmd/cmd-event.c	Sat Dec 31 15:25:03 2011 +0200
     6.3 @@ -25,7 +25,6 @@
     6.4  	unsigned int limit;
     6.5  	const char *event_str;
     6.6  	struct event *reply;
     6.7 -	string_t *line;
     6.8  	bool forward = event_get_bool(event, "forward");
     6.9  
    6.10  	limit = (unsigned int)strtoul(event_get(event, "limit"), NULL, 10);
    6.11 @@ -45,7 +44,6 @@
    6.12  
    6.13  	event_filter_get_time_range(filter, &start_time, &end_time);
    6.14  
    6.15 -	line = t_str_new(512);
    6.16  	iter = event_db_iterate_init(event_db, filter,
    6.17  				     start_time, end_time, forward);
    6.18  	while ((event_str = event_db_iterate_str(iter, &id)) != NULL) {

     7.1 --- a/src/server/irc/irc-event-pair.c	Sat Dec 31 15:21:12 2011 +0200
     7.2 +++ b/src/server/irc/irc-event-pair.c	Sat Dec 31 15:25:03 2011 +0200
     7.3 @@ -512,7 +512,6 @@
     7.4  			break;
     7.5  
     7.6  		/* get the next non-remote argument */
     7.7 -		next = cmd->next;
     7.8  		for (next = cmd->next; next != NULL; next = next->next) {
     7.9  			if (next->remote_arg == NULL)
    7.10  				break;
    7.11 @@ -535,7 +534,6 @@
    7.12  	const char *nick = event_get(event, IRC_EVENT_KEY_NICK);
    7.13  	const char *address = event_get(event, IRC_EVENT_KEY_ADDRESS);
    7.14  	const char **args = event_get_control(event, irc_args_untranslated);
    7.15 -	unsigned int arg_count;
    7.16  	bool nonpaired_event, local_reply;
    7.17  	int ret;
    7.18  
    7.19 @@ -554,7 +552,6 @@
    7.20  
    7.21  	/* incoming_server_address is sent after 001 event. no commands should
    7.22  	   actually be sent before 001 is received, but allow anyway.. */
    7.23 -	arg_count = str_array_length(args);
    7.24  	local_reply = *address != '\0' ||
    7.25  		irc_gwconn->incoming_server_address == NULL ||
    7.26  		strcmp(nick, irc_gwconn->incoming_server_address) == 0;

     8.1 --- a/src/server/irc/irc-xhtml.c	Sat Dec 31 15:21:12 2011 +0200
     8.2 +++ b/src/server/irc/irc-xhtml.c	Sat Dec 31 15:25:03 2011 +0200
     8.3 @@ -223,7 +223,6 @@
     8.4  static void event_msg(struct event *event)
     8.5  {
     8.6  	struct gateway_connection *gwconn;
     8.7 -	struct irc_gateway_connection *irc_gwconn;
     8.8  	const char *msg;
     8.9  	const unsigned char *p;
    8.10  	struct irc_msg_parser_context ctx;
    8.11 @@ -233,7 +232,6 @@
    8.12  	    event_isset(event, EVENT_KEY_MSG_XHTML_IM))
    8.13  		return;
    8.14  
    8.15 -	irc_gwconn = (struct irc_gateway_connection *)gwconn;
    8.16  	msg = event_get(event, EVENT_KEY_MSG_TEXT);
    8.17  
    8.18  	/* convert all IRCisms to xhtml-im. first make a quick scan to see