Changeset 5ebff60 for protocols/jabber/jabber_util.c

Timestamp:

2015-02-20T22:50:54Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b9daac, 3d45471, 7733b8c

Parents:

af359b4

git-author:

Indent <please@…> (19-02-15 05:47:20)

git-committer:

dequis <dx@…> (20-02-15 22:50:54)

Message:

Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg

Commit author set to "Indent <please@…>" so that it's easier to
skip while doing git blame.

File:

• protocols/jabber/jabber_util.c (modified) (17 diffs)

protocols/jabber/jabber_util.c

@@ -4 +4 @@
 *  Jabber module - Misc. stuff                                              *
 *                                                                           *
-*  Copyright 2006-2010 Wilmer van der Gaast <wilmer@gaast.net>              
+*  Copyright 2006-2010 Wilmer van der Gaast <wilmer@gaast.net>
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -28 +28 @@
 static unsigned int next_id = 1;
 
-char *set_eval_priority( set_t *set, char *value )
+char *set_eval_priority(set_t *set, char *value)
 {
         account_t *acc = set->data;
         int i;
-        
-        if( sscanf( value, "%d", &i ) == 1 )
-        {
+
+        if (sscanf(value, "%d", &i) == 1) {
                 /* Priority is a signed 8-bit integer, according to RFC 3921. */
-                if( i < -128 || i > 127 )
+                if (i < -128 || i > 127) {
                         return SET_INVALID;
-        }
-        else
+                }
+        } else {
                 return SET_INVALID;
-        
+        }
+
         /* Only run this stuff if the account is online ATM,
            and if the setting seems to be acceptable. */
-        if( acc->ic )
-        {
+        if (acc->ic) {
                 /* Although set_eval functions usually are very nice and
                    convenient, they have one disadvantage: If I would just
@@ -51 +50 @@
                    send the old setting because the set->value gets changed
                    after the (this) eval returns a non-NULL value.
-                   
+
                    So now I can choose between implementing post-set
                    functions next to evals, or just do this little hack: */
-                
-                g_free( set->value );
-                set->value = g_strdup( value );
-                
+
+                g_free(set->value);
+                set->value = g_strdup(value);
+
                 /* (Yes, sorry, I prefer the hack. :-P) */
-                
-                presence_send_update( acc->ic );
-        }
-        
+
+                presence_send_update(acc->ic);
+        }
+
         return value;
 }
 
-char *set_eval_tls( set_t *set, char *value )
-{
-        if( g_strcasecmp( value, "try" ) == 0 )
+char *set_eval_tls(set_t *set, char *value)
+{
+        if (g_strcasecmp(value, "try") == 0) {
                 return value;
-        else
-                return set_eval_bool( set, value );
-}
-
-struct xt_node *jabber_make_packet( char *name, char *type, char *to, struct xt_node *children )
+        } else {
+                return set_eval_bool(set, value);
+        }
+}
+
+struct xt_node *jabber_make_packet(char *name, char *type, char *to, struct xt_node *children)
 {
         struct xt_node *node;
-        
-        node = xt_new_node( name, NULL, children );
-        
-        if( type )
-                xt_add_attr( node, "type", type );
-        if( to )
-                xt_add_attr( node, "to", to );
-        
+
+        node = xt_new_node(name, NULL, children);
+
+        if (type) {
+                xt_add_attr(node, "type", type);
+        }
+        if (to) {
+                xt_add_attr(node, "to", to);
+        }
+
         /* IQ packets should always have an ID, so let's generate one. It
            might get overwritten by jabber_cache_add() if this packet has
            to be saved until we receive a response. Cached packets get
            slightly different IDs so we can recognize them. */
-        if( strcmp( name, "iq" ) == 0 )
-        {
-                char *id = g_strdup_printf( "%s%05x", JABBER_PACKET_ID, ( next_id++ ) & 0xfffff );
-                xt_add_attr( node, "id", id );
-                g_free( id );
-        }
-        
+        if (strcmp(name, "iq") == 0) {
+                char *id = g_strdup_printf("%s%05x", JABBER_PACKET_ID, (next_id++) & 0xfffff);
+                xt_add_attr(node, "id", id);
+                g_free(id);
+        }
+
         return node;
 }
 
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code )
+struct xt_node *jabber_make_error_packet(struct xt_node *orig, char *err_cond, char *err_type, char *err_code)
 {
         struct xt_node *node, *c;
         char *to;
-        
+
         /* Create the "defined-condition" tag. */
-        c = xt_new_node( err_cond, NULL, NULL );
-        xt_add_attr( c, "xmlns", XMLNS_STANZA_ERROR );
-        
+        c = xt_new_node(err_cond, NULL, NULL);
+        xt_add_attr(c, "xmlns", XMLNS_STANZA_ERROR);
+
         /* Put it in an <error> tag. */
-        c = xt_new_node( "error", NULL, c );
-        xt_add_attr( c, "type", err_type );
-        
+        c = xt_new_node("error", NULL, c);
+        xt_add_attr(c, "type", err_type);
+
         /* Add the error code, if present */
-        if (err_code)
-                xt_add_attr( c, "code", err_code );
-        
+        if (err_code) {
+                xt_add_attr(c, "code", err_code);
+        }
+
         /* To make the actual error packet, we copy the original packet and
            add our <error>/type="error" tag. Including the original packet
            is recommended, so let's just do it. */
-        node = xt_dup( orig );
-        xt_add_child( node, c );
-        xt_add_attr( node, "type", "error" );
-        
+        node = xt_dup(orig);
+        xt_add_child(node, c);
+        xt_add_attr(node, "type", "error");
+
         /* Return to sender. */
-        if( ( to = xt_find_attr( node, "from" ) ) )
-        {
-                xt_add_attr( node, "to", to );
-                xt_remove_attr( node, "from" );
-        }
-                
+        if ((to = xt_find_attr(node, "from"))) {
+                xt_add_attr(node, "to", to);
+                xt_remove_attr(node, "from");
+        }
+
         return node;
 }
@@ -136 +137 @@
    them when you receive the response. Use this BEFORE sending the packet so
    it'll get a new id= tag, and do NOT free() the packet after sending it! */
-void jabber_cache_add( struct im_connection *ic, struct xt_node *node, jabber_cache_event func )
+void jabber_cache_add(struct im_connection *ic, struct xt_node *node, jabber_cache_event func)
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_cache_entry *entry = g_new0( struct jabber_cache_entry, 1 );
+        struct jabber_cache_entry *entry = g_new0(struct jabber_cache_entry, 1);
         md5_state_t id_hash;
         md5_byte_t id_sum[16];
         char *id, *asc_hash;
-        
-        next_id ++;
-        
+
+        next_id++;
+
         id_hash = jd->cached_id_prefix;
-        md5_append( &id_hash, (md5_byte_t*) &next_id, sizeof( next_id ) );
-        md5_digest_keep( &id_hash, id_sum );
-        asc_hash = base64_encode( id_sum, 12 );
-        
-        id = g_strdup_printf( "%s%s", JABBER_CACHED_ID, asc_hash );
-        xt_add_attr( node, "id", id );
-        g_free( id );
-        g_free( asc_hash );
-        
+        md5_append(&id_hash, (md5_byte_t *) &next_id, sizeof(next_id));
+        md5_digest_keep(&id_hash, id_sum);
+        asc_hash = base64_encode(id_sum, 12);
+
+        id = g_strdup_printf("%s%s", JABBER_CACHED_ID, asc_hash);
+        xt_add_attr(node, "id", id);
+        g_free(id);
+        g_free(asc_hash);
+
         entry->node = node;
         entry->func = func;
-        entry->saved_at = time( NULL );
-        g_hash_table_insert( jd->node_cache, xt_find_attr( node, "id" ), entry );
-}
-
-void jabber_cache_entry_free( gpointer data )
+        entry->saved_at = time(NULL);
+        g_hash_table_insert(jd->node_cache, xt_find_attr(node, "id"), entry);
+}
+
+void jabber_cache_entry_free(gpointer data)
 {
         struct jabber_cache_entry *entry = data;
-        
-        xt_free_node( entry->node );
-        g_free( entry );
-}
-
-gboolean jabber_cache_clean_entry( gpointer key, gpointer entry, gpointer nullpointer );
+
+        xt_free_node(entry->node);
+        g_free(entry);
+}
+
+gboolean jabber_cache_clean_entry(gpointer key, gpointer entry, gpointer nullpointer);
 
 /* This one should be called from time to time (from keepalive, in this case)
@@ -177 +178 @@
    node should be available in the cache for at least a minute (assuming the
    function is indeed called every minute). */
-void jabber_cache_clean( struct im_connection *ic )
+void jabber_cache_clean(struct im_connection *ic)
 {
         struct jabber_data *jd = ic->proto_data;
-        time_t threshold = time( NULL ) - JABBER_CACHE_MAX_AGE;
-        
-        g_hash_table_foreach_remove( jd->node_cache, jabber_cache_clean_entry, &threshold );
-}
-
-gboolean jabber_cache_clean_entry( gpointer key, gpointer entry_, gpointer threshold_ )
+        time_t threshold = time(NULL) - JABBER_CACHE_MAX_AGE;
+
+        g_hash_table_foreach_remove(jd->node_cache, jabber_cache_clean_entry, &threshold);
+}
+
+gboolean jabber_cache_clean_entry(gpointer key, gpointer entry_, gpointer threshold_)
 {
         struct jabber_cache_entry *entry = entry_;
         time_t *threshold = threshold_;
-        
+
         return entry->saved_at < *threshold;
 }
 
-xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *node )
+xt_status jabber_cache_handle_packet(struct im_connection *ic, struct xt_node *node)
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_cache_entry *entry;
         char *s;
-        
-        if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
-            strncmp( s, JABBER_CACHED_ID, strlen( JABBER_CACHED_ID ) ) != 0 )
-        {
+
+        if ((s = xt_find_attr(node, "id")) == NULL ||
+            strncmp(s, JABBER_CACHED_ID, strlen(JABBER_CACHED_ID)) != 0) {
                 /* Silently ignore it, without an ID (or a non-cache
                    ID) we don't know how to handle the packet and we
@@ -207 +207 @@
                 return XT_HANDLED;
         }
-        
-        entry = g_hash_table_lookup( jd->node_cache, s );
-        
-        if( entry == NULL )
-        {
+
+        entry = g_hash_table_lookup(jd->node_cache, s);
+
+        if (entry == NULL) {
                 /*
                 There's no longer an easy way to see if we generated this
                 one or someone else, and there's a ten-minute timeout anyway,
                 so meh.
-                
+
                 imcb_log( ic, "Warning: Received %s-%s packet with unknown/expired ID %s!",
                               node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
                 */
-        }
-        else if( entry->func )
-        {
-                return entry->func( ic, node, entry->node );
-        }
-        
+        } else if (entry->func) {
+                return entry->func(ic, node, entry->node);
+        }
+
         return XT_HANDLED;
 }
@@ -238 +235 @@
 };
 
-const struct jabber_away_state *jabber_away_state_by_code( char *code )
+const struct jabber_away_state *jabber_away_state_by_code(char *code)
 {
         int i;
-        
-        if( code == NULL )
+
+        if (code == NULL) {
                 return NULL;
-        
-        for( i = 0; jabber_away_state_list[i].full_name; i ++ )
-                if( g_strcasecmp( jabber_away_state_list[i].code, code ) == 0 )
+        }
+
+        for (i = 0; jabber_away_state_list[i].full_name; i++) {
+                if (g_strcasecmp(jabber_away_state_list[i].code, code) == 0) {
                         return jabber_away_state_list + i;
-        
+                }
+        }
+
         return NULL;
 }
 
-const struct jabber_away_state *jabber_away_state_by_name( char *name )
+const struct jabber_away_state *jabber_away_state_by_name(char *name)
 {
         int i;
-        
-        if( name == NULL )
+
+        if (name == NULL) {
                 return NULL;
-        
-        for( i = 0; jabber_away_state_list[i].full_name; i ++ )
-                if( g_strcasecmp( jabber_away_state_list[i].full_name, name ) == 0 )
+        }
+
+        for (i = 0; jabber_away_state_list[i].full_name; i++) {
+                if (g_strcasecmp(jabber_away_state_list[i].full_name, name) == 0) {
                         return jabber_away_state_list + i;
-        
+                }
+        }
+
         return NULL;
 }
 
-struct jabber_buddy_ask_data
-{
+struct jabber_buddy_ask_data {
         struct im_connection *ic;
         char *handle;
@@ -273 +275 @@
 };
 
-static void jabber_buddy_ask_yes( void *data )
+static void jabber_buddy_ask_yes(void *data)
 {
         struct jabber_buddy_ask_data *bla = data;
-        
-        presence_send_request( bla->ic, bla->handle, "subscribed" );
-        
-        imcb_ask_add( bla->ic, bla->handle, NULL );
-        
-        g_free( bla->handle );
-        g_free( bla );
-}
-
-static void jabber_buddy_ask_no( void *data )
+
+        presence_send_request(bla->ic, bla->handle, "subscribed");
+
+        imcb_ask_add(bla->ic, bla->handle, NULL);
+
+        g_free(bla->handle);
+        g_free(bla);
+}
+
+static void jabber_buddy_ask_no(void *data)
 {
         struct jabber_buddy_ask_data *bla = data;
-        
-        presence_send_request( bla->ic, bla->handle, "unsubscribed" );
-        
-        g_free( bla->handle );
-        g_free( bla );
-}
-
-void jabber_buddy_ask( struct im_connection *ic, char *handle )
-{
-        struct jabber_buddy_ask_data *bla = g_new0( struct jabber_buddy_ask_data, 1 );
+
+        presence_send_request(bla->ic, bla->handle, "unsubscribed");
+
+        g_free(bla->handle);
+        g_free(bla);
+}
+
+void jabber_buddy_ask(struct im_connection *ic, char *handle)
+{
+        struct jabber_buddy_ask_data *bla = g_new0(struct jabber_buddy_ask_data, 1);
         char *buf;
-        
+
         bla->ic = ic;
-        bla->handle = g_strdup( handle );
-        
-        buf = g_strdup_printf( "The user %s wants to add you to his/her buddy list.", handle );
-        imcb_ask( ic, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no );
-        g_free( buf );
+        bla->handle = g_strdup(handle);
+
+        buf = g_strdup_printf("The user %s wants to add you to his/her buddy list.", handle);
+        imcb_ask(ic, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no);
+        g_free(buf);
 }
 
 /* Compares just the bare portions of two Jabber IDs. */
-int jabber_compare_jid( const char *jid1, const char *jid2 )
+int jabber_compare_jid(const char *jid1, const char *jid2)
 {
         int i;
-        
-        for( i = 0; ; i ++ )
-        {
-                if( jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/' )
-                {
-                        if( ( jid1[i] == '\0' || jid1[i] == '/' ) && ( jid2[i] == '\0' || jid2[i] == '/' ) )
+
+        for (i = 0;; i++) {
+                if (jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/') {
+                        if ((jid1[i] == '\0' || jid1[i] == '/') && (jid2[i] == '\0' || jid2[i] == '/')) {
                                 break;
+                        }
                         return FALSE;
                 }
-                if( g_ascii_tolower( jid1[i] ) != g_ascii_tolower( jid2[i] ) )
-                {
+                if (g_ascii_tolower(jid1[i]) != g_ascii_tolower(jid2[i])) {
                         return FALSE;
                 }
         }
-        
+
         return TRUE;
 }
@@ -332 +332 @@
 /* The /resource part is case sensitive. This stops once we see a slash.
    Returns a new string. Don't leak it! */
-char *jabber_normalize( const char *orig )
+char *jabber_normalize(const char *orig)
 {
         char *lower, *new, *s;
 
-        if ( ! ( s = strchr( orig, '/' ) ) )
-                return g_utf8_strdown( orig, -1 );
-
-        lower = g_utf8_strdown( orig, (s - orig) );  /* stop in s */
-        new = g_strconcat( lower, s, NULL );
-        g_free( lower );
+        if (!(s = strchr(orig, '/'))) {
+                return g_utf8_strdown(orig, -1);
+        }
+
+        lower = g_utf8_strdown(orig, (s - orig));    /* stop in s */
+        new = g_strconcat(lower, s, NULL);
+        g_free(lower);
         return new;
 }
@@ -347 +348 @@
 /* Similar to jabber_normalize, but works with addresses in the form
  * resource=chatroom@example.com */
-char *jabber_normalize_ext( const char *orig )
+char *jabber_normalize_ext(const char *orig)
 {
         char *lower, *new, *s;
 
-        if ( ! ( s = strchr( orig, '=' ) ) )
-                return g_utf8_strdown( orig, -1 );
-
-        lower = g_utf8_strdown( s, -1 ); /* start in s */
+        if (!(s = strchr(orig, '='))) {
+                return g_utf8_strdown(orig, -1);
+        }
+
+        lower = g_utf8_strdown(s, -1);   /* start in s */
 
         *s = 0;
-        new = g_strconcat( orig, lower, NULL );
+        new = g_strconcat(orig, lower, NULL);
         *s = '=';
 
-        g_free( lower );
+        g_free(lower);
         return new;
 }
@@ -369 +371 @@
    to deal with that properly. Set their ->resource property to NULL. Do *NOT*
    allow to mix this stuff, though... */
-struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid_ )
+struct jabber_buddy *jabber_buddy_add(struct im_connection *ic, char *full_jid_)
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *new, *bi;
         char *s, *full_jid;
-        
-        full_jid = jabber_normalize( full_jid_ );
-        
-        if( ( s = strchr( full_jid, '/' ) ) )
+
+        full_jid = jabber_normalize(full_jid_);
+
+        if ((s = strchr(full_jid, '/'))) {
                 *s = 0;
-        
-        new = g_new0( struct jabber_buddy, 1 );
-        
-        if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
-        {
+        }
+
+        new = g_new0(struct jabber_buddy, 1);
+
+        if ((bud = g_hash_table_lookup(jd->buddies, full_jid))) {
                 /* The first entry is always a bare JID. If there are more, we
                    should ignore the first one here. */
-                if( bud->next )
+                if (bud->next) {
                         bud = bud->next;
-                
+                }
+
                 /* If this is a transport buddy or whatever, it can't have more
                    than one instance, so this is always wrong: */
-                if( s == NULL || bud->resource == NULL )
-                {
-                        if( s ) *s = '/';
-                        g_free( new );
-                        g_free( full_jid );
+                if (s == NULL || bud->resource == NULL) {
+                        if (s) {
+                                *s = '/';
+                        }
+                        g_free(new);
+                        g_free(full_jid);
                         return NULL;
                 }
-                
+
                 new->bare_jid = bud->bare_jid;
-                
+
                 /* We already have another resource for this buddy, add the
                    new one to the list. */
-                for( bi = bud; bi; bi = bi->next )
-                {
+                for (bi = bud; bi; bi = bi->next) {
                         /* Check for dupes. */
-                        if( strcmp( bi->resource, s + 1 ) == 0 )
-                        {
+                        if (strcmp(bi->resource, s + 1) == 0) {
                                 *s = '/';
-                                g_free( new );
-                                g_free( full_jid );
+                                g_free(new);
+                                g_free(full_jid);
                                 return NULL;
                         }
                         /* Append the new item to the list. */
-                        else if( bi->next == NULL )
-                        {
+                        else if (bi->next == NULL) {
                                 bi->next = new;
                                 break;
                         }
                 }
-        }
-        else
-        {
-                new->full_jid = new->bare_jid = g_strdup( full_jid );
-                g_hash_table_insert( jd->buddies, new->bare_jid, new );
-                
-                if( s )
-                {
-                        new->next = g_new0( struct jabber_buddy, 1 );
+        } else {
+                new->full_jid = new->bare_jid = g_strdup(full_jid);
+                g_hash_table_insert(jd->buddies, new->bare_jid, new);
+
+                if (s) {
+                        new->next = g_new0(struct jabber_buddy, 1);
                         new->next->bare_jid = new->bare_jid;
                         new = new->next;
                 }
         }
-        
-        if( s )
-        {
+
+        if (s) {
                 *s = '/';
                 new->full_jid = full_jid;
-                new->resource = strchr( new->full_jid, '/' ) + 1;
-        }
-        else
-        {
+                new->resource = strchr(new->full_jid, '/') + 1;
+        } else {
                 /* Let's waste some more bytes of RAM instead of to make
                    memory management a total disaster here. And it saves
@@ -447 +442 @@
                 new->full_jid = full_jid;
         }
-        
+
         return new;
 }
@@ -454 +449 @@
    asked for a bare JID, it uses the "resource_select" setting to see which
    resource to pick. */
-struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, get_buddy_flags_t flags )
+struct jabber_buddy *jabber_buddy_by_jid(struct im_connection *ic, char *jid_, get_buddy_flags_t flags)
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *head;
         char *s, *jid;
-        
-        jid = jabber_normalize( jid_ );
-        
-        if( ( s = strchr( jid, '/' ) ) )
-        {
+
+        jid = jabber_normalize(jid_);
+
+        if ((s = strchr(jid, '/'))) {
                 int bare_exists = 0;
-                
+
                 *s = 0;
-                if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
-                {
+                if ((bud = g_hash_table_lookup(jd->buddies, jid))) {
                         bare_exists = 1;
-                        
-                        if( bud->next )
+
+                        if (bud->next) {
                                 bud = bud->next;
-                        
+                        }
+
                         /* Just return the first one for this bare JID. */
-                        if( flags & GET_BUDDY_FIRST )
-                        {
+                        if (flags & GET_BUDDY_FIRST) {
                                 *s = '/';
-                                g_free( jid );
+                                g_free(jid);
                                 return bud;
                         }
-                        
+
                         /* Is this one of those no-resource buddies? */
-                        if( bud->resource == NULL )
-                        {
+                        if (bud->resource == NULL) {
                                 *s = '/';
-                                g_free( jid );
+                                g_free(jid);
                                 return NULL;
                         }
-                        
+
                         /* See if there's an exact match. */
-                        for( ; bud; bud = bud->next )
-                                if( strcmp( bud->resource, s + 1 ) == 0 )
+                        for (; bud; bud = bud->next) {
+                                if (strcmp(bud->resource, s + 1) == 0) {
                                         break;
-                }
-                
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) )
-                {
+                                }
+                        }
+                }
+
+                if (bud == NULL && (flags & GET_BUDDY_CREAT) &&
+                    (bare_exists || bee_user_by_handle(ic->bee, ic, jid))) {
                         *s = '/';
-                        bud = jabber_buddy_add( ic, jid );
-                }
-                
-                g_free( jid );
+                        bud = jabber_buddy_add(ic, jid);
+                }
+
+                g_free(jid);
                 return bud;
-        }
-        else
-        {
+        } else {
                 struct jabber_buddy *best_prio, *best_time;
                 char *set;
-                
-                head = g_hash_table_lookup( jd->buddies, jid );
-                bud = ( head && head->next ) ? head->next : head;
-                
-                g_free( jid );
-                
-                if( bud == NULL )
+
+                head = g_hash_table_lookup(jd->buddies, jid);
+                bud = (head && head->next) ? head->next : head;
+
+                g_free(jid);
+
+                if (bud == NULL) {
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) &&
-                                 bee_user_by_handle( ic->bee, ic, jid_ ) ) ?
-                                   jabber_buddy_add( ic, jid_ ) : NULL;
-                else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )
+                        return ((flags & GET_BUDDY_CREAT) &&
+                                bee_user_by_handle(ic->bee, ic, jid_)) ?
+                               jabber_buddy_add(ic, jid_) : NULL;
+                } else if (bud->resource && (flags & GET_BUDDY_EXACT)) {
                         /* We want an exact match, so in thise case there shouldn't be a /resource. */
                         return NULL;
-                else if( bud->resource == NULL || bud->next == NULL )
+                } else if (bud->resource == NULL || bud->next == NULL) {
                         /* No need for selection if there's only one option. */
                         return bud;
-                else if( flags & GET_BUDDY_FIRST )
+                } else if (flags & GET_BUDDY_FIRST) {
                         /* Looks like the caller doesn't care about details. */
                         return bud;
-                else if( flags & GET_BUDDY_BARE )
+                } else if (flags & GET_BUDDY_BARE) {
                         return head;
-                
+                }
+
                 best_prio = best_time = bud;
-                for( ; bud; bud = bud->next )
-                {
-                        if( bud->priority > best_prio->priority )
+                for (; bud; bud = bud->next) {
+                        if (bud->priority > best_prio->priority) {
                                 best_prio = bud;
-                        if( bud->last_msg > best_time->last_msg )
+                        }
+                        if (bud->last_msg > best_time->last_msg) {
                                 best_time = bud;
-                }
-                
-                if( ( set = set_getstr( &ic->acc->set, "resource_select" ) ) == NULL )
+                        }
+                }
+
+                if ((set = set_getstr(&ic->acc->set, "resource_select")) == NULL) {
                         return NULL;
-                else if( strcmp( set, "priority" ) == 0 )
+                } else if (strcmp(set, "priority") == 0) {
                         return best_prio;
-                else if( flags & GET_BUDDY_BARE_OK ) /* && strcmp( set, "activity" ) == 0 */
-                {
-                        if( best_time->last_msg + set_getint( &ic->acc->set, "activity_timeout" ) >= time( NULL ) )
+                } else if (flags & GET_BUDDY_BARE_OK) { /* && strcmp( set, "activity" ) == 0 */
+                        if (best_time->last_msg + set_getint(&ic->acc->set, "activity_timeout") >= time(NULL)) {
                                 return best_time;
-                        else
+                        } else {
                                 return head;
-                }
-                else
+                        }
+                } else {
                         return best_time;
+                }
         }
 }
@@ -565 +558 @@
    replacing the / with a =. But there should be some stripping (@s are
    allowed in Jabber nicks...). */
-struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *jid_, get_buddy_flags_t flags )
+struct jabber_buddy *jabber_buddy_by_ext_jid(struct im_connection *ic, char *jid_, get_buddy_flags_t flags)
 {
         struct jabber_buddy *bud;
         char *s, *jid;
-        
-        jid = jabber_normalize_ext( jid_ );
-        
-        if( ( s = strchr( jid, '=' ) ) == NULL )
+
+        jid = jabber_normalize_ext(jid_);
+
+        if ((s = strchr(jid, '=')) == NULL) {
                 return NULL;
-        
-        for( bud = jabber_buddy_by_jid( ic, s + 1, GET_BUDDY_FIRST ); bud; bud = bud->next )
-        {
+        }
+
+        for (bud = jabber_buddy_by_jid(ic, s + 1, GET_BUDDY_FIRST); bud; bud = bud->next) {
                 /* Hmmm, could happen if not all people in the chat are anonymized? */
-                if( bud->ext_jid == NULL )
+                if (bud->ext_jid == NULL) {
                         continue;
-                
-                if( strcmp( bud->ext_jid, jid ) == 0 )
+                }
+
+                if (strcmp(bud->ext_jid, jid) == 0) {
                         break;
-        }
-        
-        g_free( jid );
-        
+                }
+        }
+
+        g_free(jid);
+
         return bud;
 }
@@ -593 +588 @@
    off-line (because (s)he can still be online from a different location.
    XXX: See above, we should accept bare JIDs too... */
-int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ )
+int jabber_buddy_remove(struct im_connection *ic, char *full_jid_)
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *prev = NULL, *bi;
         char *s, *full_jid;
-        
-        full_jid = jabber_normalize( full_jid_ );
-        
-        if( ( s = strchr( full_jid, '/' ) ) )
+
+        full_jid = jabber_normalize(full_jid_);
+
+        if ((s = strchr(full_jid, '/'))) {
                 *s = 0;
-        
-        if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
-        {
-                if( bud->next )
-                        bud = (prev=bud)->next;
-                
+        }
+
+        if ((bud = g_hash_table_lookup(jd->buddies, full_jid))) {
+                if (bud->next) {
+                        bud = (prev = bud)->next;
+                }
+
                 /* If there's only one item in the list (and if the resource
                    matches), removing it is simple. (And the hash reference
                    should be removed too!) */
-                if( bud->next == NULL &&
-                    ( ( s == NULL && bud->resource == NULL ) ||
-                      ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
-                {
-                        int st = jabber_buddy_remove_bare( ic, full_jid );
-                        g_free( full_jid );
+                if (bud->next == NULL &&
+                    ((s == NULL && bud->resource == NULL) ||
+                     (bud->resource && s && strcmp(bud->resource, s + 1) == 0))) {
+                        int st = jabber_buddy_remove_bare(ic, full_jid);
+                        g_free(full_jid);
                         return st;
-                }
-                else if( s == NULL || bud->resource == NULL )
-                {
+                } else if (s == NULL || bud->resource == NULL) {
                         /* Tried to remove a bare JID while this JID does seem
                            to have resources... (Or the opposite.) *sigh* */
-                        g_free( full_jid );
+                        g_free(full_jid);
                         return 0;
-                }
-                else
-                {
-                        for( bi = bud; bi; bi = (prev=bi)->next )
-                                if( strcmp( bi->resource, s + 1 ) == 0 )
+                } else {
+                        for (bi = bud; bi; bi = (prev = bi)->next) {
+                                if (strcmp(bi->resource, s + 1) == 0) {
                                         break;
-                        
-                        g_free( full_jid );
-                        
-                        if( bi )
-                        {
-                                if( prev )
+                                }
+                        }
+
+                        g_free(full_jid);
+
+                        if (bi) {
+                                if (prev) {
                                         prev->next = bi->next;
-                                else
+                                } else {
                                         /* Don't think this should ever happen anymore. */
-                                        g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next );
-                                
-                                g_free( bi->ext_jid );
-                                g_free( bi->full_jid );
-                                g_free( bi->away_message );
-                                g_free( bi );
-                                
+                                        g_hash_table_replace(jd->buddies, bi->bare_jid, bi->next);
+                                }
+
+                                g_free(bi->ext_jid);
+                                g_free(bi->full_jid);
+                                g_free(bi->away_message);
+                                g_free(bi);
+
                                 return 1;
-                        }
-                        else
-                        {
+                        } else {
                                 return 0;
                         }
                 }
-        }
-        else
-        {
-                g_free( full_jid );
+        } else {
+                g_free(full_jid);
                 return 0;
         }
@@ -666 +655 @@
    specified bare JID. Use this when removing someone from the contact
    list, for example. */
-int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid )
+int jabber_buddy_remove_bare(struct im_connection *ic, char *bare_jid)
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *next;
-        
-        if( strchr( bare_jid, '/' ) )
+
+        if (strchr(bare_jid, '/')) {
                 return 0;
-        
-        if( ( bud = jabber_buddy_by_jid( ic, bare_jid, GET_BUDDY_FIRST ) ) )
-        {
+        }
+
+        if ((bud = jabber_buddy_by_jid(ic, bare_jid, GET_BUDDY_FIRST))) {
                 /* Most important: Remove the hash reference. We don't know
                    this buddy anymore. */
-                g_hash_table_remove( jd->buddies, bud->bare_jid );
-                g_free( bud->bare_jid );
-                
+                g_hash_table_remove(jd->buddies, bud->bare_jid);
+                g_free(bud->bare_jid);
+
                 /* Deallocate the linked list of resources. */
-                while( bud )
-                {
+                while (bud) {
                         /* ext_jid && anonymous means that this buddy is
                            specific to one groupchat (the one we're
                            currently cleaning up) so it can be deleted
                            completely. */
-                        if( bud->ext_jid && bud->flags & JBFLAG_IS_ANONYMOUS )
-                                imcb_remove_buddy( ic, bud->ext_jid, NULL );
-                        
+                        if (bud->ext_jid && bud->flags & JBFLAG_IS_ANONYMOUS) {
+                                imcb_remove_buddy(ic, bud->ext_jid, NULL);
+                        }
+
                         next = bud->next;
-                        g_free( bud->ext_jid );
-                        g_free( bud->full_jid );
-                        g_free( bud->away_message );
-                        g_free( bud );
+                        g_free(bud->ext_jid);
+                        g_free(bud->full_jid);
+                        g_free(bud->away_message);
+                        g_free(bud);
                         bud = next;
                 }
-                
+
                 return 1;
-        }
-        else
-        {
+        } else {
                 return 0;
         }
 }
 
-static gboolean jabber_buddy_remove_all_cb( gpointer key, gpointer value, gpointer data )
+static gboolean jabber_buddy_remove_all_cb(gpointer key, gpointer value, gpointer data)
 {
         struct jabber_buddy *bud, *next;
-        
+
         bud = value;
-        if( bud->bare_jid != bud->full_jid )
-                g_free( bud->bare_jid );
-        while( bud )
-        {
+        if (bud->bare_jid != bud->full_jid) {
+                g_free(bud->bare_jid);
+        }
+        while (bud) {
                 next = bud->next;
-                g_free( bud->ext_jid );
-                g_free( bud->full_jid );
-                g_free( bud->away_message );
-                g_free( bud );
+                g_free(bud->ext_jid);
+                g_free(bud->full_jid);
+                g_free(bud->away_message);
+                g_free(bud);
                 bud = next;
         }
-        
+
         return TRUE;
 }
 
-void jabber_buddy_remove_all( struct im_connection *ic )
+void jabber_buddy_remove_all(struct im_connection *ic)
 {
         struct jabber_data *jd = ic->proto_data;
-        
-        g_hash_table_foreach_remove( jd->buddies, jabber_buddy_remove_all_cb, NULL );
-        g_hash_table_destroy( jd->buddies );
-}
-
-time_t jabber_get_timestamp( struct xt_node *xt )
+
+        g_hash_table_foreach_remove(jd->buddies, jabber_buddy_remove_all_cb, NULL);
+        g_hash_table_destroy(jd->buddies);
+}
+
+time_t jabber_get_timestamp(struct xt_node *xt)
 {
         struct xt_node *c;
@@ -744 +731 @@
 
         /* XEP-0091 has <x> */
-        c = xt_find_node_by_attr( xt->children, "x", "xmlns", XMLNS_DELAY_OLD );
-
-        if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+        c = xt_find_node_by_attr(xt->children, "x", "xmlns", XMLNS_DELAY_OLD);
+
+        if (!c || !(s = xt_find_attr(c, "stamp"))) {
                 is_old = FALSE;
 
                 /* XEP-0203 has <delay> */
-                c = xt_find_node_by_attr( xt->children, "delay", "xmlns", XMLNS_DELAY );
-                if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+                c = xt_find_node_by_attr(xt->children, "delay", "xmlns", XMLNS_DELAY);
+                if (!c || !(s = xt_find_attr(c, "stamp"))) {
                         return 0;
                 }
         }
-        
-        memset( &tp, 0, sizeof( tp ) );
+
+        memset(&tp, 0, sizeof(tp));
 
         /* The other main difference between XEPs is the timestamp format */
         format = (is_old) ? "%4d%2d%2dT%2d:%2d:%2d" : "%4d-%2d-%2dT%2d:%2d:%2dZ";
 
-        if( sscanf( s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
-                               &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
+        if (sscanf(s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
+                   &tp.tm_hour, &tp.tm_min, &tp.tm_sec) != 6) {
                 return 0;
-        
+        }
+
         tp.tm_year -= 1900;
-        tp.tm_mon --;
-        
-        return mktime_utc( &tp );
-}
-
-struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns )
+        tp.tm_mon--;
+
+        return mktime_utc(&tp);
+}
+
+struct jabber_error *jabber_error_parse(struct xt_node *node, char *xmlns)
 {
         struct jabber_error *err;
         struct xt_node *c;
         char *s;
-        
-        if( node == NULL )
+
+        if (node == NULL) {
                 return NULL;
-        
-        err = g_new0( struct jabber_error, 1 );
-        err->type = xt_find_attr( node, "type" );
-        
-        for( c = node->children; c; c = c->next )
-        {
-                if( !( s = xt_find_attr( c, "xmlns" ) ) ||
-                    strcmp( s, xmlns ) != 0 )
+        }
+
+        err = g_new0(struct jabber_error, 1);
+        err->type = xt_find_attr(node, "type");
+
+        for (c = node->children; c; c = c->next) {
+                if (!(s = xt_find_attr(c, "xmlns")) ||
+                    strcmp(s, xmlns) != 0) {
                         continue;
-                
-                if( strcmp( c->name, "text" ) != 0 )
-                {
+                }
+
+                if (strcmp(c->name, "text") != 0) {
                         err->code = c->name;
                 }
                 /* Only use the text if it doesn't have an xml:lang attribute,
                    if it's empty or if it's set to something English. */
-                else if( !( s = xt_find_attr( c, "xml:lang" ) ) ||
-                         !*s || strncmp( s, "en", 2 ) == 0 )
-                {
+                else if (!(s = xt_find_attr(c, "xml:lang")) ||
+                         !*s || strncmp(s, "en", 2) == 0) {
                         err->text = c->text;
                 }
         }
-        
+
         return err;
 }
 
-void jabber_error_free( struct jabber_error *err )
-{
-        g_free( err );
-}
-
-gboolean jabber_set_me( struct im_connection *ic, const char *me )
+void jabber_error_free(struct jabber_error *err)
+{
+        g_free(err);
+}
+
+gboolean jabber_set_me(struct im_connection *ic, const char *me)
 {
         struct jabber_data *jd = ic->proto_data;
-        
-        if( strchr( me, '@' ) == NULL )
+
+        if (strchr(me, '@') == NULL) {
                 return FALSE;
-        
-        g_free( jd->username );
-        g_free( jd->me );
-        
-        jd->me = jabber_normalize( me );
-        jd->server = strchr( jd->me, '@' );
-        jd->username = g_strndup( jd->me, jd->server - jd->me );
-        jd->server ++;
+        }
+
+        g_free(jd->username);
+        g_free(jd->me);
+
+        jd->me = jabber_normalize(me);
+        jd->server = strchr(jd->me, '@');
+        jd->username = g_strndup(jd->me, jd->server - jd->me);
+        jd->server++;
 
         /* Set the "internal" account username, for groupchats */
-        g_free( jd->internal_jid );
-        jd->internal_jid = g_strdup( jd->me );
-        
+        g_free(jd->internal_jid);
+        jd->internal_jid = g_strdup(jd->me);
+
         return TRUE;
 }