devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Applied coding style to src/xmpp/

Browse Source
This commit is contained in:
James Booth
2015-10-26 00:14:23 +00:00
parent 2ce43b633f
commit c8a6bdb381
14 changed files with 524 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/xmpp/roster.c
View File

@@ -60,8 +60,7 @@
#include "xmpp/stanza.h"
#include "xmpp/xmpp.h"
#define HANDLE(type, func) xmpp_handler_add(conn, func, XMPP_NS_ROSTER, \
STANZA_NAME_IQ, type, ctx)
#define HANDLE(type, func) xmpp_handler_add(conn, func, XMPP_NS_ROSTER, STANZA_NAME_IQ, type, ctx)
// callback data for group commands
typedef struct _group_data {
@@ -70,21 +69,15 @@ typedef struct _group_data {
} GroupData;
// event handlers
static int _roster_set_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
static int _roster_result_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
static int _roster_set_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
static int _roster_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
// id handlers
static int
_group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata);
static int
_group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata);
static int _group_add_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
static int _group_remove_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
// helper functions
GSList * _get_groups_from_item(xmpp_stanza_t *item);
GSList* _get_groups_from_item(xmpp_stanza_t *item);
void
roster_add_handlers(void)
@@ -107,7 +100,7 @@ roster_request(void)
}
void
roster_send_add_new(const char * const barejid, const char * const name)
roster_send_add_new(const char *const barejid, const char *const name)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
@@ -119,7 +112,7 @@ roster_send_add_new(const char * const barejid, const char * const name)
}
void
roster_send_remove(const char * const barejid)
roster_send_remove(const char *const barejid)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
@@ -129,7 +122,7 @@ roster_send_remove(const char * const barejid)
}
void
roster_send_name_change(const char * const barejid, const char * const new_name, GSList *groups)
roster_send_name_change(const char *const barejid, const char *const new_name, GSList *groups)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
@@ -141,7 +134,7 @@ roster_send_name_change(const char * const barejid, const char * const new_name,
}
void
roster_send_add_to_group(const char * const group, PContact contact)
roster_send_add_to_group(const char *const group, PContact contact)
{
GSList *groups = p_contact_groups(contact);
GSList *new_groups = NULL;
@@ -172,8 +165,8 @@ roster_send_add_to_group(const char * const group, PContact contact)
}
static int
_group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
_group_add_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza,
void *const userdata)
{
if (userdata) {
GroupData *data = userdata;
@@ -186,7 +179,7 @@ _group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
}
void
roster_send_remove_from_group(const char * const group, PContact contact)
roster_send_remove_from_group(const char *const group, PContact contact)
{
GSList *groups = p_contact_groups(contact);
GSList *new_groups = NULL;
@@ -219,8 +212,8 @@ roster_send_remove_from_group(const char * const group, PContact contact)
}
static int
_group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
_group_remove_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza,
void *const userdata)
{
if (userdata) {
GroupData *data = userdata;
@@ -233,8 +226,8 @@ _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
}
static int
_roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
_roster_set_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza,
void *const userdata)
{
xmpp_stanza_t *query =
xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
@@ -303,7 +296,7 @@ _roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
}
static int
_roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
_roster_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata)
{
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
@@ -375,7 +368,7 @@ _roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, v
return 1;
}
GSList *
GSList*
_get_groups_from_item(xmpp_stanza_t *item)
{
GSList *groups = NULL;