devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 16:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup jid_destroy to auto_jid

Browse Source 
Remove unused variables
Apply minor cleanups
This commit is contained in:
John Hernandez
2023-07-13 15:11:30 +02:00
parent 8304ac86ff
commit 029f1caa52
25 changed files with 125 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xmpp/bookmark.c
View File

@@ -93,11 +93,10 @@ bookmark_add(const char* jid, const char* nick, const char* password, const char
{
assert(jid != NULL);
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (jidp->domainpart) {
muc_confserver_add(jidp->domainpart);
}
jid_destroy(jidp);
if (g_hash_table_contains(bookmarks, jid)) {
return FALSE;
@@ -334,11 +333,10 @@ _bookmark_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
sv_ev_bookmark_autojoin(bookmark);
}
Jid* jidp = jid_create(barejid);
auto_jid Jid* jidp = jid_create(barejid);
if (jidp->domainpart) {
muc_confserver_add(jidp->domainpart);
}
jid_destroy(jidp);
child = xmpp_stanza_get_next(child);
}
@@ -387,11 +385,10 @@ _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);
auto_jid Jid* jidp = jid_create(bookmark->barejid);
if (jidp->localpart) {
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, jidp->localpart);
}
jid_destroy(jidp);
}
if (bookmark->autojoin) {

3
src/xmpp/chat_session.c
View File

@@ -110,9 +110,8 @@ chat_session_get_jid(const char* const barejid)
ChatSession* session = chat_session_get(barejid);
char* jid = NULL;
if (session) {
Jid* jidp = jid_create_from_bare_and_resource(session->barejid, session->resource);
auto_jid Jid* jidp = jid_create_from_bare_and_resource(session->barejid, session->resource);
jid = strdup(jidp->fulljid);
jid_destroy(jidp);
} else {
jid = strdup(barejid);
}

3
src/xmpp/connection.c
View File

@@ -181,7 +181,7 @@ connection_shutdown(void)
static gboolean
_conn_apply_settings(const char* const jid, const char* const passwd, const char* const tls_policy, const char* const auth_policy)
{
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (jidp == NULL) {
log_error("Malformed JID not able to connect: %s", jid);
conn.conn_status = JABBER_DISCONNECTED;
@@ -189,7 +189,6 @@ _conn_apply_settings(const char* const jid, const char* const passwd, const char
}
_compute_identifier(jidp->barejid);
jid_destroy(jidp);
xmpp_ctx_set_verbosity(conn.xmpp_ctx, 0);
xmpp_conn_set_jid(conn.xmpp_conn, jid);

7
src/xmpp/iq.c
View File

@@ -1080,11 +1080,10 @@ _room_list_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
const char* item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID);
auto_gchar gchar* item_jid_lower = NULL;
if (item_jid) {
Jid* jidp = jid_create(item_jid);
auto_jid Jid* jidp = jid_create(item_jid);
if (jidp && jidp->localpart) {
item_jid_lower = g_utf8_strdown(jidp->localpart, -1);
}
jid_destroy(jidp);
}
const char* item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME);
auto_gchar gchar* item_name_lower = NULL;
@@ -1505,7 +1504,7 @@ _version_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
xmpp_ctx_t* ctx = connection_get_ctx();
Jid* jidp = jid_create((char*)userdata);
auto_jid Jid* jidp = jid_create((char*)userdata);
const char* presence = NULL;
@@ -1543,8 +1542,6 @@ _version_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
ui_show_software_version(jidp->barejid, "online", name_str, version_str, os_str);
}
jid_destroy(jidp);
if (name_str)
xmpp_free(ctx, name_str);
if (version_str)

6
src/xmpp/muc.c
View File

@@ -495,11 +495,10 @@ muc_roster_add(const char* const room, const char* const nick, const char* const
g_hash_table_replace(chat_room->roster, strdup(nick), occupant);
if (jid) {
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (jidp->barejid) {
autocomplete_add(chat_room->jid_ac, jidp->barejid);
}
jid_destroy(jidp);
}
}
@@ -771,13 +770,12 @@ muc_jid_autocomplete_add_all(const char* const room, GSList* jids)
GSList* curr_jid = jids;
while (curr_jid) {
const char* jid = curr_jid->data;
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (jidp) {
if (jidp->barejid) {
autocomplete_add(chat_room->jid_ac, jidp->barejid);
}
}
jid_destroy(jidp);
curr_jid = g_slist_next(curr_jid);
}
}

40
src/xmpp/omemo.c
View File

@@ -389,21 +389,21 @@ omemo_receive_message(xmpp_stanza_t* const stanza, gboolean* trusted)
size_t iv_len;
iv_raw = g_base64_decode(iv_text, &iv_len);
if (!iv_raw) {
goto out;
return NULL;
}
xmpp_stanza_t* payload = xmpp_stanza_get_child_by_name(encrypted, "payload");
if (!payload) {
goto out;
return NULL;
}
payload_text = xmpp_stanza_get_text(payload);
if (!payload_text) {
goto out;
return NULL;
}
size_t payload_len;
payload_raw = g_base64_decode(payload_text, &payload_len);
if (!payload_raw) {
goto out;
return NULL;
}
xmpp_stanza_t* key_stanza;
@@ -415,27 +415,26 @@ omemo_receive_message(xmpp_stanza_t* const stanza, gboolean* trusted)
omemo_key_t* key = malloc(sizeof(omemo_key_t));
char* key_text = xmpp_stanza_get_text(key_stanza);
if (!key_text) {
goto skip;
free(key);
continue;
}
const char* rid_text = xmpp_stanza_get_attribute(key_stanza, "rid");
key->device_id = strtoul(rid_text, NULL, 10);
if (!key->device_id) {
goto skip;
free(key);
continue;
}
key->data = g_base64_decode(key_text, &key->length);
free(key_text);
if (!key->data) {
goto skip;
free(key);
continue;
}
key->prekey = g_strcmp0(xmpp_stanza_get_attribute(key_stanza, "prekey"), "true") == 0
|| g_strcmp0(xmpp_stanza_get_attribute(key_stanza, "prekey"), "1") == 0;
keys = g_list_append(keys, key);
continue;
skip:
free(key);
}
const char* from = xmpp_stanza_get_from(stanza);
@@ -444,7 +443,6 @@ skip:
keys, payload_raw, payload_len,
g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0, trusted);
out:
if (keys) {
g_list_free_full(keys, (GDestroyNotify)omemo_key_free);
}
@@ -610,8 +608,8 @@ _omemo_devicelist_configure_submit(xmpp_stanza_t* const stanza, void* const user
form_set_value(form, "pubsub#access_model", "open");
xmpp_ctx_t* const ctx = connection_get_ctx();
Jid* jid = jid_create(connection_get_fulljid());
char* id = connection_create_stanza_id();
auto_jid Jid* jid = jid_create(connection_get_fulljid());
auto_char char* id = connection_create_stanza_id();
xmpp_stanza_t* iq = stanza_create_pubsub_configure_submit(ctx, id, jid->barejid, STANZA_NS_OMEMO_DEVICELIST, form);
iq_id_handler_add(id, _omemo_devicelist_configure_result, NULL, NULL);
@@ -619,8 +617,6 @@ _omemo_devicelist_configure_submit(xmpp_stanza_t* const stanza, void* const user
iq_send_stanza(iq);
xmpp_stanza_release(iq);
free(id);
jid_destroy(jid);
return 0;
}
@@ -664,8 +660,8 @@ _omemo_bundle_publish_result(xmpp_stanza_t* const stanza, void* const userdata)
log_debug("[OMEMO] cannot publish bundle with open access model, trying to configure node");
xmpp_ctx_t* const ctx = connection_get_ctx();
Jid* jid = jid_create(connection_get_fulljid());
char* id = connection_create_stanza_id();
auto_jid Jid* jid = jid_create(connection_get_fulljid());
auto_char char* id = connection_create_stanza_id();
auto_gchar gchar* node = g_strdup_printf("%s:%d", STANZA_NS_OMEMO_BUNDLES, omemo_device_id());
log_debug("[OMEMO] node: %s", node);
@@ -676,8 +672,6 @@ _omemo_bundle_publish_result(xmpp_stanza_t* const stanza, void* const userdata)
iq_send_stanza(iq);
xmpp_stanza_release(iq);
free(id);
jid_destroy(jid);
return 0;
}
@@ -706,8 +700,8 @@ _omemo_bundle_publish_configure(xmpp_stanza_t* const stanza, void* const userdat
form_set_value(form, "pubsub#access_model", "open");
xmpp_ctx_t* const ctx = connection_get_ctx();
Jid* jid = jid_create(connection_get_fulljid());
char* id = connection_create_stanza_id();
auto_jid Jid* jid = jid_create(connection_get_fulljid());
auto_char char* id = connection_create_stanza_id();
auto_gchar gchar* node = g_strdup_printf("%s:%d", STANZA_NS_OMEMO_BUNDLES, omemo_device_id());
xmpp_stanza_t* iq = stanza_create_pubsub_configure_submit(ctx, id, jid->barejid, node, form);
@@ -716,8 +710,6 @@ _omemo_bundle_publish_configure(xmpp_stanza_t* const stanza, void* const userdat
iq_send_stanza(iq);
xmpp_stanza_release(iq);
free(id);
jid_destroy(jid);
return 0;
}

41
src/xmpp/presence.c
View File

@@ -96,7 +96,7 @@ presence_subscription(const char* const jid, const jabber_subscr_t action)
{
assert(jid != NULL);
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
autocomplete_remove(sub_requests_ac, jidp->barejid);
const char* type = NULL;
@@ -129,7 +129,6 @@ presence_subscription(const char* const jid, const jabber_subscr_t action)
xmpp_stanza_set_type(presence, type);
xmpp_stanza_set_to(presence, jidp->barejid);
jid_destroy(jidp);
_send_presence_stanza(presence);
@@ -278,7 +277,7 @@ _send_room_presence(xmpp_stanza_t* presence)
void
presence_join_room(const char* const room, const char* const nick, const char* const passwd)
{
Jid* jid = jid_create_from_bare_and_resource(room, nick);
auto_jid Jid* jid = jid_create_from_bare_and_resource(room, nick);
log_debug("Sending room join presence to: %s", jid->fulljid);
resource_presence_t presence_type = accounts_get_last_presence(session_get_account_name());
@@ -296,7 +295,6 @@ presence_join_room(const char* const room, const char* const nick, const char* c
_send_presence_stanza(presence);
xmpp_stanza_release(presence);
jid_destroy(jid);
}
void
@@ -415,13 +413,12 @@ _presence_error_handler(xmpp_stanza_t* const stanza)
error_cond = "unknown";
}
Jid* fulljid = jid_create(from);
auto_jid Jid* fulljid = jid_create(from);
log_info("Error joining room: %s, reason: %s", fulljid->barejid, error_cond);
if (muc_active(fulljid->barejid)) {
muc_leave(fulljid->barejid);
}
cons_show_error("Error joining room %s, reason: %s", fulljid->barejid, error_cond);
jid_destroy(fulljid);
return;
}
@@ -472,11 +469,9 @@ _unsubscribed_handler(xmpp_stanza_t* const stanza)
}
log_debug("Unsubscribed presence handler fired for %s", from);
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
sv_ev_subscription(from_jid->barejid, PRESENCE_UNSUBSCRIBED);
autocomplete_remove(sub_requests_ac, from_jid->barejid);
jid_destroy(from_jid);
}
static void
@@ -489,11 +484,9 @@ _subscribed_handler(xmpp_stanza_t* const stanza)
}
log_debug("Subscribed presence handler fired for %s", from);
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
sv_ev_subscription(from_jid->barejid, PRESENCE_SUBSCRIBED);
autocomplete_remove(sub_requests_ac, from_jid->barejid);
jid_destroy(from_jid);
}
static void
@@ -505,15 +498,13 @@ _subscribe_handler(xmpp_stanza_t* const stanza)
}
log_debug("Subscribe presence handler fired for %s", from);
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
if (from_jid == NULL) {
return;
}
sv_ev_subscription(from_jid->barejid, PRESENCE_SUBSCRIBE);
autocomplete_add(sub_requests_ac, from_jid->barejid);
jid_destroy(from_jid);
}
static void
@@ -529,11 +520,9 @@ _unavailable_handler(xmpp_stanza_t* const stanza)
}
log_debug("Unavailable presence handler fired for %s", from);
Jid* my_jid = jid_create(jid);
Jid* from_jid = jid_create(from);
auto_jid Jid* my_jid = jid_create(jid);
auto_jid Jid* from_jid = jid_create(from);
if (my_jid == NULL || from_jid == NULL) {
jid_destroy(my_jid);
jid_destroy(from_jid);
return;
}
@@ -551,9 +540,6 @@ _unavailable_handler(xmpp_stanza_t* const stanza)
connection_remove_available_resource(from_jid->resourcepart);
}
}
jid_destroy(my_jid);
jid_destroy(from_jid);
}
static void
@@ -634,7 +620,7 @@ _available_handler(xmpp_stanza_t* const stanza)
xmpp_conn_t* conn = connection_get_conn();
const char* my_jid_str = xmpp_conn_get_jid(conn);
Jid* my_jid = jid_create(my_jid_str);
auto_jid Jid* my_jid = jid_create(my_jid_str);
XMPPCaps* caps = stanza_parse_caps(stanza);
if ((g_strcmp0(my_jid->fulljid, xmpp_presence->jid->fulljid) != 0) && caps) {
@@ -721,7 +707,6 @@ _available_handler(xmpp_stanza_t* const stanza)
xmpp_free(ctx, pgpsig);
}
jid_destroy(my_jid);
stanza_free_presence(xmpp_presence);
}
@@ -752,7 +737,7 @@ static void
_muc_user_self_handler(xmpp_stanza_t* stanza)
{
const char* from = xmpp_stanza_get_from(stanza);
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
log_debug("Room self presence received from %s", from_jid->fulljid);
@@ -823,8 +808,6 @@ _muc_user_self_handler(xmpp_stanza_t* stanza)
}
sv_ev_muc_self_online(room, nick, config_required, role, affiliation, actor, reason, jid, show_str, status_str);
}
jid_destroy(from_jid);
}
static void
@@ -921,13 +904,11 @@ _muc_user_handler(xmpp_stanza_t* const stanza)
return;
}
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
if (from_jid == NULL || from_jid->resourcepart == NULL) {
log_warning("MUC User stanza received with invalid from attribute: %s", from);
jid_destroy(from_jid);
return;
}
jid_destroy(from_jid);
if (stanza_is_muc_self_presence(stanza, connection_get_fulljid())) {
_muc_user_self_handler(stanza);

6
src/xmpp/roster_list.c
View File

@@ -151,9 +151,8 @@ roster_update_presence(const char* const barejid, Resource* resource, GDateTime*
p_contact_set_last_activity(contact, last_activity);
}
p_contact_set_presence(contact, resource);
Jid* jid = jid_create_from_bare_and_resource(barejid, resource->name);
auto_jid Jid* jid = jid_create_from_bare_and_resource(barejid, resource->name);
autocomplete_add(roster->fulljid_ac, jid->fulljid);
jid_destroy(jid);
return TRUE;
}
@@ -237,9 +236,8 @@ roster_contact_offline(const char* const barejid, const char* const resource, co
} else {
gboolean result = p_contact_remove_resource(contact, resource);
if (result == TRUE) {
Jid* jid = jid_create_from_bare_and_resource(barejid, resource);
auto_jid Jid* jid = jid_create_from_bare_and_resource(barejid, resource);
autocomplete_remove(roster->fulljid_ac, jid->fulljid);
jid_destroy(jid);
}
return result;

8
src/xmpp/session.c
View File

@@ -123,9 +123,8 @@ session_connect_with_account(const ProfAccount* const account)
auto_char char* jid = NULL;
if (account->resource) {
Jid* jidp = jid_create_from_bare_and_resource(account->jid, account->resource);
auto_jid Jid* jidp = jid_create_from_bare_and_resource(account->jid, account->resource);
jid = strdup(jidp->fulljid);
jid_destroy(jidp);
} else {
jid = strdup(account->jid);
}
@@ -175,16 +174,15 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
}
// use 'profanity' when no resourcepart in provided jid
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (jidp->resourcepart == NULL) {
jid_destroy(jidp);
auto_gchar gchar* resource = jid_random_resource();
jid_destroy(jidp);
jidp = jid_create_from_bare_and_resource(jid, resource);
saved_details.jid = strdup(jidp->fulljid);
} else {
saved_details.jid = strdup(jid);
}
jid_destroy(jidp);
// connect with fulljid
log_info("Connecting without account, JID: %s", saved_details.jid);

6
src/xmpp/stanza.c
View File

@@ -1395,11 +1395,10 @@ stanza_is_muc_self_presence(xmpp_stanza_t* const stanza,
// check if 'from' attribute identifies this user
const char* from = xmpp_stanza_get_from(stanza);
if (from) {
Jid* from_jid = jid_create(from);
auto_jid Jid* from_jid = jid_create(from);
if (muc_active(from_jid->barejid)) {
char* nick = muc_nick(from_jid->barejid);
if (g_strcmp0(from_jid->resourcepart, nick) == 0) {
jid_destroy(from_jid);
return TRUE;
}
}
@@ -1411,13 +1410,10 @@ stanza_is_muc_self_presence(xmpp_stanza_t* const stanza,
char* nick = muc_nick(from_jid->barejid);
char* old_nick = muc_old_nick(from_jid->barejid, new_nick);
if (g_strcmp0(old_nick, nick) == 0) {
jid_destroy(from_jid);
return TRUE;
}
}
}
jid_destroy(from_jid);
}
// self presence not found