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

Apply coding style

Browse Source 
Regards https://github.com/profanity-im/profanity/issues/1396
This commit is contained in:
Michael Vetter
2020-07-07 09:43:28 +02:00
parent 66f9a6b721
commit 9b55f2dec0
214 changed files with 19572 additions and 17582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/xmpp/bookmark.c
View File

@@ -36,10 +36,10 @@
#include "config.h"
#include <assert.h>
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#ifdef HAVE_LIBMESODE
#include <mesode.h>
@@ -50,26 +50,26 @@
#endif
#include "common.h"
#include "log.h"
#include "event/server_events.h"
#include "log.h"
#include "plugins/plugins.h"
#include "ui/ui.h"
#include "xmpp/bookmark.h"
#include "xmpp/connection.h"
#include "xmpp/iq.h"
#include "xmpp/muc.h"
#include "xmpp/stanza.h"
#include "xmpp/xmpp.h"
#include "xmpp/bookmark.h"
#include "xmpp/muc.h"
#define BOOKMARK_TIMEOUT 5000
static Autocomplete bookmark_ac;
static GHashTable *bookmarks;
static GHashTable* bookmarks;
// id handlers
static int _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata);
static int _bookmark_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata);
static void _bookmark_destroy(Bookmark *bookmark);
static void _bookmark_destroy(Bookmark* bookmark);
static void _send_bookmarks(void);
void
@@ -83,11 +83,11 @@ bookmark_request(void)
autocomplete_free(bookmark_ac);
bookmark_ac = autocomplete_new();
char *id = "bookmark_init_request";
char* id = "bookmark_init_request";
iq_id_handler_add(id, _bookmark_result_id_handler, free, NULL);
xmpp_ctx_t *ctx = connection_get_ctx();
xmpp_stanza_t *iq = stanza_create_bookmarks_storage_request(ctx);
xmpp_ctx_t* ctx = connection_get_ctx();
xmpp_stanza_t* iq = stanza_create_bookmarks_storage_request(ctx);
xmpp_stanza_set_id(iq, id);
iq_send_stanza(iq);
@@ -95,11 +95,11 @@ bookmark_request(void)
}
gboolean
bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name)
bookmark_add(const char* jid, const char* nick, const char* password, const char* autojoin_str, const char* name)
{
assert(jid != NULL);
Jid *jidp = jid_create(jid);
Jid* jidp = jid_create(jid);
if (jidp->domainpart) {
muc_confserver_add(jidp->domainpart);
}
@@ -109,7 +109,7 @@ bookmark_add(const char *jid, const char *nick, const char *password, const char
return FALSE;
}
Bookmark *bookmark = malloc(sizeof(Bookmark));
Bookmark* bookmark = malloc(sizeof(Bookmark));
bookmark->barejid = strdup(jid);
if (nick) {
bookmark->nick = strdup(nick);
@@ -142,11 +142,11 @@ bookmark_add(const char *jid, const char *nick, const char *password, const char
}
gboolean
bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name)
bookmark_update(const char* jid, const char* nick, const char* password, const char* autojoin_str, const char* name)
{
assert(jid != NULL);
Bookmark *bookmark = g_hash_table_lookup(bookmarks, jid);
Bookmark* bookmark = g_hash_table_lookup(bookmarks, jid);
if (!bookmark) {
return FALSE;
}
@@ -176,19 +176,19 @@ bookmark_update(const char *jid, const char *nick, const char *password, const c
}
gboolean
bookmark_join(const char *jid)
bookmark_join(const char* jid)
{
assert(jid != NULL);
Bookmark *bookmark = g_hash_table_lookup(bookmarks, jid);
Bookmark* bookmark = g_hash_table_lookup(bookmarks, jid);
if (!bookmark) {
return FALSE;
}
char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
char* account_name = session_get_account_name();
ProfAccount* account = accounts_get_account(account_name);
if (!muc_active(bookmark->barejid)) {
char *nick = bookmark->nick;
char* nick = bookmark->nick;
if (!nick) {
nick = account->muc_nick;
}
@@ -207,11 +207,11 @@ bookmark_join(const char *jid)
}
gboolean
bookmark_remove(const char *jid)
bookmark_remove(const char* jid)
{
assert(jid != NULL);
Bookmark *bookmark = g_hash_table_lookup(bookmarks, jid);
Bookmark* bookmark = g_hash_table_lookup(bookmarks, jid);
if (!bookmark) {
return FALSE;
}
@@ -231,7 +231,7 @@ bookmark_get_list(void)
}
char*
bookmark_find(const char *const search_str, gboolean previous, void *context)
bookmark_find(const char* const search_str, gboolean previous, void* context)
{
return autocomplete_complete(bookmark_ac, search_str, TRUE, previous);
}
@@ -245,24 +245,24 @@ bookmark_autocomplete_reset(void)
}
gboolean
bookmark_exists(const char *const room)
bookmark_exists(const char* const room)
{
return g_hash_table_contains(bookmarks, room);
}
static int
_bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
_bookmark_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
{
const char *name = xmpp_stanza_get_name(stanza);
const char* name = xmpp_stanza_get_name(stanza);
if (!name || strcmp(name, STANZA_NAME_IQ) != 0) {
return 0;
}
xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
if (!query) {
return 0;
}
xmpp_stanza_t *storage = xmpp_stanza_get_child_by_name(query, STANZA_NAME_STORAGE);
xmpp_stanza_t* storage = xmpp_stanza_get_child_by_name(query, STANZA_NAME_STORAGE);
if (!storage) {
return 0;
}
@@ -271,14 +271,14 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
bookmark_ac = autocomplete_new();
}
xmpp_stanza_t *child = xmpp_stanza_get_children(storage);
xmpp_stanza_t* child = xmpp_stanza_get_children(storage);
while (child) {
name = xmpp_stanza_get_name(child);
if (!name || strcmp(name, STANZA_NAME_CONFERENCE) != 0) {
child = xmpp_stanza_get_next(child);
continue;
}
const char *barejid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID);
const char* barejid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID);
if (!barejid) {
child = xmpp_stanza_get_next(child);
continue;
@@ -286,21 +286,21 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
log_debug("Handle bookmark for %s", barejid);
const char *room_name = xmpp_stanza_get_attribute(child, "name");
const char* room_name = xmpp_stanza_get_attribute(child, "name");
char *nick = NULL;
xmpp_stanza_t *nick_st = xmpp_stanza_get_child_by_name(child, "nick");
char* nick = NULL;
xmpp_stanza_t* nick_st = xmpp_stanza_get_child_by_name(child, "nick");
if (nick_st) {
nick = stanza_text_strdup(nick_st);
}
char *password = NULL;
xmpp_stanza_t *password_st = xmpp_stanza_get_child_by_name(child, "password");
char* password = NULL;
xmpp_stanza_t* password_st = xmpp_stanza_get_child_by_name(child, "password");
if (password_st) {
password = stanza_text_strdup(password_st);
}
const char *autojoin = xmpp_stanza_get_attribute(child, "autojoin");
const char* autojoin = xmpp_stanza_get_attribute(child, "autojoin");
gboolean autojoin_val = FALSE;
if (autojoin && (strcmp(autojoin, "1") == 0 || strcmp(autojoin, "true") == 0)) {
autojoin_val = TRUE;
@@ -308,9 +308,9 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
// we save minimize, which is not standard, so that we don't remove it if it was set by gajim
int minimize = 0;
xmpp_stanza_t *minimize_st = stanza_get_child_by_name_and_ns(child, STANZA_NAME_MINIMIZE, STANZA_NS_EXT_GAJIM_BOOKMARKS);
xmpp_stanza_t* minimize_st = stanza_get_child_by_name_and_ns(child, STANZA_NAME_MINIMIZE, STANZA_NS_EXT_GAJIM_BOOKMARKS);
if (minimize_st) {
char *min_str = xmpp_stanza_get_text(minimize_st);
char* min_str = xmpp_stanza_get_text(minimize_st);
if (strcmp(min_str, "true") == 0) {
minimize = 1;
} else if (strcmp(min_str, "false") == 0) {
@@ -320,7 +320,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
}
autocomplete_add(bookmark_ac, barejid);
Bookmark *bookmark = malloc(sizeof(Bookmark));
Bookmark* bookmark = malloc(sizeof(Bookmark));
bookmark->barejid = strdup(barejid);
bookmark->nick = nick;
bookmark->password = password;
@@ -333,7 +333,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
sv_ev_bookmark_autojoin(bookmark);
}
Jid *jidp = jid_create(barejid);
Jid* jidp = jid_create(barejid);
if (jidp->domainpart) {
muc_confserver_add(jidp->domainpart);
}
@@ -346,7 +346,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
}
static void
_bookmark_destroy(Bookmark *bookmark)
_bookmark_destroy(Bookmark* bookmark)
{
if (bookmark) {
free(bookmark->barejid);
@@ -360,25 +360,25 @@ _bookmark_destroy(Bookmark *bookmark)
static void
_send_bookmarks(void)
{
xmpp_ctx_t *ctx = connection_get_ctx();
xmpp_ctx_t* ctx = connection_get_ctx();
char *id = connection_create_stanza_id();
xmpp_stanza_t *iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
char* id = connection_create_stanza_id();
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
free(id);
xmpp_stanza_t *query = xmpp_stanza_new(ctx);
xmpp_stanza_t* query = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(query, STANZA_NAME_QUERY);
xmpp_stanza_set_ns(query, "jabber:iq:private");
xmpp_stanza_t *storage = xmpp_stanza_new(ctx);
xmpp_stanza_t* storage = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(storage, STANZA_NAME_STORAGE);
xmpp_stanza_set_ns(storage, "storage:bookmarks");
GList *bookmark_list = g_hash_table_get_values(bookmarks);
GList *curr = bookmark_list;
GList* bookmark_list = g_hash_table_get_values(bookmarks);
GList* curr = bookmark_list;
while (curr) {
Bookmark *bookmark = curr->data;
xmpp_stanza_t *conference = xmpp_stanza_new(ctx);
Bookmark* bookmark = curr->data;
xmpp_stanza_t* conference = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(conference, STANZA_NAME_CONFERENCE);
xmpp_stanza_set_attribute(conference, STANZA_ATTR_JID, bookmark->barejid);
@@ -387,7 +387,7 @@ _send_bookmarks(void)
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, bookmark->name);
} else {
// use localpart of JID by if no name is specified
Jid *jidp = jid_create(bookmark->barejid);
Jid* jidp = jid_create(bookmark->barejid);
if (jidp->localpart) {
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, jidp->localpart);
}
@@ -401,9 +401,9 @@ _send_bookmarks(void)
}
if (bookmark->nick) {
xmpp_stanza_t *nick_st = xmpp_stanza_new(ctx);
xmpp_stanza_t* nick_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(nick_st, STANZA_NAME_NICK);
xmpp_stanza_t *nick_text = xmpp_stanza_new(ctx);
xmpp_stanza_t* nick_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(nick_text, bookmark->nick);
xmpp_stanza_add_child(nick_st, nick_text);
xmpp_stanza_add_child(conference, nick_st);
@@ -413,9 +413,9 @@ _send_bookmarks(void)
}
if (bookmark->password) {
xmpp_stanza_t *password_st = xmpp_stanza_new(ctx);
xmpp_stanza_t* password_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(password_st, STANZA_NAME_PASSWORD);
xmpp_stanza_t *password_text = xmpp_stanza_new(ctx);
xmpp_stanza_t* password_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(password_text, bookmark->password);
xmpp_stanza_add_child(password_st, password_text);
xmpp_stanza_add_child(conference, password_st);
@@ -424,13 +424,12 @@ _send_bookmarks(void)
xmpp_stanza_release(password_st);
}
if (bookmark->ext_gajim_minimize == 1 ||
bookmark->ext_gajim_minimize == 2) {
xmpp_stanza_t *minimize_st = xmpp_stanza_new(ctx);
if (bookmark->ext_gajim_minimize == 1 || bookmark->ext_gajim_minimize == 2) {
xmpp_stanza_t* minimize_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(minimize_st, STANZA_NAME_MINIMIZE);
xmpp_stanza_set_ns(minimize_st, STANZA_NS_EXT_GAJIM_BOOKMARKS);
xmpp_stanza_t *minimize_text = xmpp_stanza_new(ctx);
xmpp_stanza_t* minimize_text = xmpp_stanza_new(ctx);
if (bookmark->ext_gajim_minimize == 1) {
xmpp_stanza_set_text(minimize_text, "true");
} else {