Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg Commit author set to "Indent <please@skip.me>" so that it's easier to skip while doing git blame.
author: Indent <please@skip.me> 2015-02-19 02:47:20 -0300
committer: dequis <dx@dxzone.com.ar> 2015-02-20 19:50:54 -0300
commit: 5ebff60479fc7a9f7f50ac03b124c91d4e6ebe11 (patch)
tree: 9fc0d50cb1f4bc9768d9f00de94eafd876bb55b0 /protocols/bee_user.c
parent: af359b4316f9d392c6b752495a1b2ed631576ed8 (diff)
1 files changed, 161 insertions, 161 deletions
diff --git a/protocols/bee_user.c b/protocols/bee_user.c
index 4169744f..ea1be3db 100644
--- a/protocols/bee_user.c
+++ b/protocols/bee_user.c
@@ -1,4 +1,4 @@
-  /********************************************************************\
+/********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
   * Copyright 2002-2010 Wilmer van der Gaast and others                *
@@ -26,263 +26,263 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 
-bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle, bee_user_flags_t flags )
+bee_user_t *bee_user_new(bee_t *bee, struct im_connection *ic, const char *handle, bee_user_flags_t flags)
 {
 	bee_user_t *bu;
-	
-	if( bee_user_by_handle( bee, ic, handle ) != NULL )
+
+	if (bee_user_by_handle(bee, ic, handle) != NULL) {
 		return NULL;
-	
-	bu = g_new0( bee_user_t, 1 );
+	}
+
+	bu = g_new0(bee_user_t, 1);
 	bu->bee = bee;
 	bu->ic = ic;
 	bu->flags = flags;
-	bu->handle = g_strdup( handle );
-	bee->users = g_slist_prepend( bee->users, bu );
-	
-	if( bee->ui->user_new )
-		bee->ui->user_new( bee, bu );
-	if( ic->acc->prpl->buddy_data_add )
-		ic->acc->prpl->buddy_data_add( bu );
-	
+	bu->handle = g_strdup(handle);
+	bee->users = g_slist_prepend(bee->users, bu);
+
+	if (bee->ui->user_new) {
+		bee->ui->user_new(bee, bu);
+	}
+	if (ic->acc->prpl->buddy_data_add) {
+		ic->acc->prpl->buddy_data_add(bu);
+	}
+
 	/* Offline by default. This will set the right flags. */
-	imcb_buddy_status( ic, handle, 0, NULL, NULL );
-	
+	imcb_buddy_status(ic, handle, 0, NULL, NULL);
+
 	return bu;
 }
 
-int bee_user_free( bee_t *bee, bee_user_t *bu )
+int bee_user_free(bee_t *bee, bee_user_t *bu)
 {
-	if( !bu )
+	if (!bu) {
 		return 0;
-	
-	if( bee->ui->user_free )
-		bee->ui->user_free( bee, bu );
-	if( bu->ic->acc->prpl->buddy_data_free )
-		bu->ic->acc->prpl->buddy_data_free( bu );
-	
-	g_free( bu->handle );
-	g_free( bu->fullname );
-	g_free( bu->nick );
-	g_free( bu->status );
-	g_free( bu->status_msg );
-	g_free( bu );
-	
-	bee->users = g_slist_remove( bee->users, bu );
-	
+	}
+
+	if (bee->ui->user_free) {
+		bee->ui->user_free(bee, bu);
+	}
+	if (bu->ic->acc->prpl->buddy_data_free) {
+		bu->ic->acc->prpl->buddy_data_free(bu);
+	}
+
+	g_free(bu->handle);
+	g_free(bu->fullname);
+	g_free(bu->nick);
+	g_free(bu->status);
+	g_free(bu->status_msg);
+	g_free(bu);
+
+	bee->users = g_slist_remove(bee->users, bu);
+
 	return 1;
 }
 
-bee_user_t *bee_user_by_handle( bee_t *bee, struct im_connection *ic, const char *handle )
+bee_user_t *bee_user_by_handle(bee_t *bee, struct im_connection *ic, const char *handle)
 {
 	GSList *l;
-	
-	for( l = bee->users; l; l = l->next )
-	{
+
+	for (l = bee->users; l; l = l->next) {
 		bee_user_t *bu = l->data;
-		
-		if( bu->ic == ic && ic->acc->prpl->handle_cmp( bu->handle, handle ) == 0 )
+
+		if (bu->ic == ic && ic->acc->prpl->handle_cmp(bu->handle, handle) == 0) {
 			return bu;
+		}
 	}
-	
+
 	return NULL;
 }
 
-int bee_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, int flags )
+int bee_user_msg(bee_t *bee, bee_user_t *bu, const char *msg, int flags)
 {
 	char *buf = NULL;
 	int st;
-	
-	if( ( bu->ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
-	{
-		buf = escape_html( msg );
+
+	if ((bu->ic->flags & OPT_DOES_HTML) && (g_strncasecmp(msg, "<html>", 6) != 0)) {
+		buf = escape_html(msg);
 		msg = buf;
+	} else {
+		buf = g_strdup(msg);
 	}
-	else
-		buf = g_strdup( msg );
-	
-	st = bu->ic->acc->prpl->buddy_msg( bu->ic, bu->handle, buf, flags );
-	g_free( buf );
-	
+
+	st = bu->ic->acc->prpl->buddy_msg(bu->ic, bu->handle, buf, flags);
+	g_free(buf);
+
 	return st;
 }
 
 
 /* Groups */
-static bee_group_t *bee_group_new( bee_t *bee, const char *name )
+static bee_group_t *bee_group_new(bee_t *bee, const char *name)
 {
-	bee_group_t *bg = g_new0( bee_group_t, 1 );
-	
-	bg->name = g_strdup( name );
-	bg->key = g_utf8_casefold( name, -1 );
-	bee->groups = g_slist_prepend( bee->groups, bg );
-	
+	bee_group_t *bg = g_new0(bee_group_t, 1);
+
+	bg->name = g_strdup(name);
+	bg->key = g_utf8_casefold(name, -1);
+	bee->groups = g_slist_prepend(bee->groups, bg);
+
 	return bg;
 }
 
-bee_group_t *bee_group_by_name( bee_t *bee, const char *name, gboolean creat )
+bee_group_t *bee_group_by_name(bee_t *bee, const char *name, gboolean creat)
 {
 	GSList *l;
 	char *key;
-	
-	if( name == NULL )
+
+	if (name == NULL) {
 		return NULL;
-	
-	key = g_utf8_casefold( name, -1 );
-	for( l = bee->groups; l; l = l->next )
-	{
+	}
+
+	key = g_utf8_casefold(name, -1);
+	for (l = bee->groups; l; l = l->next) {
 		bee_group_t *bg = l->data;
-		if( strcmp( bg->key, key ) == 0 )
+		if (strcmp(bg->key, key) == 0) {
 			break;
+		}
 	}
-	g_free( key );
-	
-	if( !l )
-		return creat ? bee_group_new( bee, name ) : NULL;
-	else
+	g_free(key);
+
+	if (!l) {
+		return creat ? bee_group_new(bee, name) : NULL;
+	} else {
 		return l->data;
+	}
 }
 
-void bee_group_free( bee_t *bee )
+void bee_group_free(bee_t *bee)
 {
-	while( bee->groups )
-	{
+	while (bee->groups) {
 		bee_group_t *bg = bee->groups->data;
-		g_free( bg->name );
-		g_free( bg->key );
-		g_free( bg );
-		bee->groups = g_slist_remove( bee->groups, bee->groups->data );
+		g_free(bg->name);
+		g_free(bg->key);
+		g_free(bg);
+		bee->groups = g_slist_remove(bee->groups, bee->groups->data);
 	}
 }
 
 
 /* IM->UI callbacks */
-void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message )
+void imcb_buddy_status(struct im_connection *ic, const char *handle, int flags, const char *state, const char *message)
 {
 	bee_t *bee = ic->bee;
 	bee_user_t *bu, *old;
-	
-	if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
-	{
-		if( g_strcasecmp( set_getstr( &ic->bee->set, "handle_unknown" ), "add" ) == 0 )
-		{
-			bu = bee_user_new( bee, ic, handle, BEE_USER_LOCAL );
-		}
-		else
-		{
-			if( g_strcasecmp( set_getstr( &ic->bee->set, "handle_unknown" ), "ignore" ) != 0 )
-			{
-				imcb_log( ic, "imcb_buddy_status() for unknown handle %s:\n"
-				              "flags = %d, state = %s, message = %s", handle, flags,
-				              state ? state : "NULL", message ? message : "NULL" );
+
+	if (!(bu = bee_user_by_handle(bee, ic, handle))) {
+		if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "add") == 0) {
+			bu = bee_user_new(bee, ic, handle, BEE_USER_LOCAL);
+		} else {
+			if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "ignore") != 0) {
+				imcb_log(ic, "imcb_buddy_status() for unknown handle %s:\n"
+				         "flags = %d, state = %s, message = %s", handle, flags,
+				         state ? state : "NULL", message ? message : "NULL");
 			}
-			
+
 			return;
 		}
 	}
-	
+
 	/* May be nice to give the UI something to compare against. */
-	old = g_memdup( bu, sizeof( bee_user_t ) );
-	
+	old = g_memdup(bu, sizeof(bee_user_t));
+
 	/* TODO(wilmer): OPT_AWAY, or just state == NULL ? */
 	bu->flags = flags;
-	bu->status_msg = g_strdup( message );
-	if( state && *state )
-		bu->status = g_strdup( state );
-	else if( flags & OPT_AWAY )
-		bu->status = g_strdup( "Away" );
-	else
+	bu->status_msg = g_strdup(message);
+	if (state && *state) {
+		bu->status = g_strdup(state);
+	} else if (flags & OPT_AWAY) {
+		bu->status = g_strdup("Away");
+	} else {
 		bu->status = NULL;
-	
-	if( bu->status == NULL && ( flags & OPT_MOBILE ) &&
-	    set_getbool( &bee->set, "mobile_is_away" ) )
-	{
+	}
+
+	if (bu->status == NULL && (flags & OPT_MOBILE) &&
+	    set_getbool(&bee->set, "mobile_is_away")) {
 		bu->flags |= BEE_USER_AWAY;
-		bu->status = g_strdup( "Mobile" );
+		bu->status = g_strdup("Mobile");
+	}
+
+	if (bee->ui->user_status) {
+		bee->ui->user_status(bee, bu, old);
 	}
-	
-	if( bee->ui->user_status )
-		bee->ui->user_status( bee, bu, old );
-	
-	g_free( old->status_msg );
-	g_free( old->status );
-	g_free( old );
+
+	g_free(old->status_msg);
+	g_free(old->status);
+	g_free(old);
 }
 
 /* Same, but only change the away/status message, not any away/online state info. */
-void imcb_buddy_status_msg( struct im_connection *ic, const char *handle, const char *message )
+void imcb_buddy_status_msg(struct im_connection *ic, const char *handle, const char *message)
 {
 	bee_t *bee = ic->bee;
 	bee_user_t *bu, *old;
-	
-	if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
-	{
+
+	if (!(bu = bee_user_by_handle(bee, ic, handle))) {
 		return;
 	}
-	
-	old = g_memdup( bu, sizeof( bee_user_t ) );
-	
-	bu->status_msg = message && *message ? g_strdup( message ) : NULL;
-	
-	if( bee->ui->user_status )
-		bee->ui->user_status( bee, bu, old );
-	
-	g_free( old->status_msg );
-	g_free( old );
+
+	old = g_memdup(bu, sizeof(bee_user_t));
+
+	bu->status_msg = message && *message ? g_strdup(message) : NULL;
+
+	if (bee->ui->user_status) {
+		bee->ui->user_status(bee, bu, old);
+	}
+
+	g_free(old->status_msg);
+	g_free(old);
 }
 
-void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle )
+void imcb_buddy_times(struct im_connection *ic, const char *handle, time_t login, time_t idle)
 {
 	bee_t *bee = ic->bee;
 	bee_user_t *bu;
-	
-	if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
+
+	if (!(bu = bee_user_by_handle(bee, ic, handle))) {
 		return;
-	
+	}
+
 	bu->login_time = login;
 	bu->idle_time = idle;
 }
 
-void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
+void imcb_buddy_msg(struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at)
 {
 	bee_t *bee = ic->bee;
 	bee_user_t *bu;
-	
-	bu = bee_user_by_handle( bee, ic, handle );
-	
-	if( !bu && !( ic->flags & OPT_LOGGING_OUT ) )
-	{
-		char *h = set_getstr( &bee->set, "handle_unknown" );
-		
-		if( g_strcasecmp( h, "ignore" ) == 0 )
-		{
+
+	bu = bee_user_by_handle(bee, ic, handle);
+
+	if (!bu && !(ic->flags & OPT_LOGGING_OUT)) {
+		char *h = set_getstr(&bee->set, "handle_unknown");
+
+		if (g_strcasecmp(h, "ignore") == 0) {
 			return;
-		}
-		else if( g_strncasecmp( h, "add", 3 ) == 0 )
-		{
-			bu = bee_user_new( bee, ic, handle, BEE_USER_LOCAL );
+		} else if (g_strncasecmp(h, "add", 3) == 0) {
+			bu = bee_user_new(bee, ic, handle, BEE_USER_LOCAL);
 		}
 	}
-	
-	if( bee->ui->user_msg && bu )
-		bee->ui->user_msg( bee, bu, msg, sent_at );
-	else
-		imcb_log( ic, "Message from unknown handle %s:\n%s", handle, msg );
+
+	if (bee->ui->user_msg && bu) {
+		bee->ui->user_msg(bee, bu, msg, sent_at);
+	} else {
+		imcb_log(ic, "Message from unknown handle %s:\n%s", handle, msg);
+	}
 }
 
-void imcb_buddy_typing( struct im_connection *ic, const char *handle, uint32_t flags )
+void imcb_buddy_typing(struct im_connection *ic, const char *handle, uint32_t flags)
 {
 	bee_user_t *bu;
-	
-	if( ic->bee->ui->user_typing &&
-	    ( bu = bee_user_by_handle( ic->bee, ic, handle ) ) )
-	{
-		ic->bee->ui->user_typing( ic->bee, bu, flags );
+
+	if (ic->bee->ui->user_typing &&
+	    (bu = bee_user_by_handle(ic->bee, ic, handle))) {
+		ic->bee->ui->user_typing(ic->bee, bu, flags);
 	}
 }
 
-void imcb_buddy_action_response( bee_user_t *bu, const char *action, char * const args[], void *data )
+void imcb_buddy_action_response(bee_user_t *bu, const char *action, char * const args[], void *data)
 {
-	if( bu->bee->ui->user_action_response )
-		bu->bee->ui->user_action_response( bu->bee, bu, action, args, data );
+	if (bu->bee->ui->user_action_response) {
+		bu->bee->ui->user_action_response(bu->bee, bu, action, args, data);
+	}
 }
author	Indent <please@skip.me>	2015-02-19 02:47:20 -0300
committer	dequis <dx@dxzone.com.ar>	2015-02-20 19:50:54 -0300
commit	5ebff60479fc7a9f7f50ac03b124c91d4e6ebe11 (patch)
tree	9fc0d50cb1f4bc9768d9f00de94eafd876bb55b0 /protocols/bee_user.c
parent	af359b4316f9d392c6b752495a1b2ed631576ed8 (diff)