devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 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

3
src/ui/console.c
View File

@@ -1141,9 +1141,8 @@ cons_show_account(ProfAccount* account)
win_append(console, presence_colour, ", \"%s\"", resource->status);
}
win_appendln(console, THEME_DEFAULT, "");
Jid* jidp = jid_create_from_bare_and_resource(account->jid, resource->name);
auto_jid Jid* jidp = jid_create_from_bare_and_resource(account->jid, resource->name);
EntityCapabilities* caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp);
if (caps) {
// show identity

6
src/ui/core.c
View File

@@ -1045,7 +1045,6 @@ ui_contact_offline(char* barejid, char* resource, char* status)
{
auto_gchar gchar* show_console = prefs_get_string(PREF_STATUSES_CONSOLE);
auto_gchar gchar* show_chat_win = prefs_get_string(PREF_STATUSES_CHAT);
Jid* jid = jid_create_from_bare_and_resource(barejid, resource);
PContact contact = roster_get_contact(barejid);
if (p_contact_subscription(contact)) {
if (strcmp(p_contact_subscription(contact), "none") != 0) {
@@ -1080,8 +1079,6 @@ ui_contact_offline(char* barejid, char* resource, char* status)
if (chatwin && chatwin->resource_override && (g_strcmp0(resource, chatwin->resource_override) == 0)) {
FREE_SET_NULL(chatwin->resource_override);
}
jid_destroy(jid);
}
void
@@ -1261,13 +1258,12 @@ void
ui_show_software_version(const char* const jid, const char* const presence,
const char* const name, const char* const version, const char* const os)
{
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
ProfWin* window = NULL;
ProfWin* chatwin = (ProfWin*)wins_get_chat(jidp->barejid);
ProfWin* mucwin = (ProfWin*)wins_get_muc(jidp->barejid);
ProfWin* privwin = (ProfWin*)wins_get_private(jidp->fulljid);
ProfWin* console = wins_get_console();
jid_destroy(jidp);
if (chatwin) {
if (wins_is_current(chatwin)) {

6
src/ui/occupantswin.c
View File

@@ -85,9 +85,8 @@ _occuptantswin_occupant(ProfLayoutSplit* layout, GList* item, gboolean showjid,
gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP);
if (isoffline) {
Jid* jid = jid_create(item->data);
auto_jid Jid* jid = jid_create(item->data);
g_string_append(msg, jid->barejid);
jid_destroy(jid);
} else {
g_string_append(msg, occupant->nick);
}
@@ -208,7 +207,7 @@ occupantswin_occupants(const char* const roomjid)
g_string_free(role, TRUE);
roster_curr = members;
while (roster_curr) {
Jid* jid = jid_create(roster_curr->data);
auto_jid Jid* jid = jid_create(roster_curr->data);
gboolean found = false;
GList* iter = online_occupants;
for (; iter != NULL; iter = iter->next) {
@@ -223,7 +222,6 @@ occupantswin_occupants(const char* const roomjid)
offline_occupants = g_list_append(offline_occupants, jid->barejid);
}
jid_destroy(jid);
roster_curr = g_list_next(roster_curr);
}
g_list_free(members);

31
src/ui/privwin.c
View File

@@ -59,7 +59,7 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message)
ProfWin* window = (ProfWin*)privatewin;
int num = wins_get_num(window);
Jid* jidp = jid_create(privatewin->fulljid);
auto_jid Jid* jidp = jid_create(privatewin->fulljid);
if (jidp == NULL) {
return;
}
@@ -97,8 +97,6 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message)
if (notify) {
notify_message(jidp->resourcepart, num, message->plain);
}
jid_destroy(jidp);
}
void
@@ -133,9 +131,8 @@ privwin_occupant_offline(ProfPrivateWin* privwin)
assert(privwin != NULL);
privwin->occupant_offline = TRUE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
win_println((ProfWin*)privwin, THEME_OFFLINE, "-", "<- %s has left the room.", jidp->resourcepart);
jid_destroy(jidp);
}
void
@@ -144,9 +141,8 @@ privwin_occupant_kicked(ProfPrivateWin* privwin, const char* const actor, const
assert(privwin != NULL);
privwin->occupant_offline = TRUE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
GString* message = g_string_new(jidp->resourcepart);
jid_destroy(jidp);
g_string_append(message, " has been kicked from the room");
if (actor) {
g_string_append(message, " by ");
@@ -167,9 +163,8 @@ privwin_occupant_banned(ProfPrivateWin* privwin, const char* const actor, const
assert(privwin != NULL);
privwin->occupant_offline = TRUE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
GString* message = g_string_new(jidp->resourcepart);
jid_destroy(jidp);
g_string_append(message, " has been banned from the room");
if (actor) {
g_string_append(message, " by ");
@@ -190,9 +185,8 @@ privwin_occupant_online(ProfPrivateWin* privwin)
assert(privwin != NULL);
privwin->occupant_offline = FALSE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
win_println((ProfWin*)privwin, THEME_ONLINE, "-", "-- %s has joined the room.", jidp->resourcepart);
jid_destroy(jidp);
}
void
@@ -201,9 +195,8 @@ privwin_room_destroyed(ProfPrivateWin* privwin)
assert(privwin != NULL);
privwin->room_left = TRUE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
win_println((ProfWin*)privwin, THEME_OFFLINE, "!", "-- %s has been destroyed.", jidp->barejid);
jid_destroy(jidp);
}
void
@@ -212,9 +205,8 @@ privwin_room_joined(ProfPrivateWin* privwin)
assert(privwin != NULL);
privwin->room_left = FALSE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
win_println((ProfWin*)privwin, THEME_OFFLINE, "!", "-- You have joined %s.", jidp->barejid);
jid_destroy(jidp);
}
void
@@ -223,9 +215,8 @@ privwin_room_left(ProfPrivateWin* privwin)
assert(privwin != NULL);
privwin->room_left = TRUE;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
win_println((ProfWin*)privwin, THEME_OFFLINE, "!", "-- You have left %s.", jidp->barejid);
jid_destroy(jidp);
}
void
@@ -235,9 +226,8 @@ privwin_room_kicked(ProfPrivateWin* privwin, const char* const actor, const char
privwin->room_left = TRUE;
GString* message = g_string_new("Kicked from ");
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
g_string_append(message, jidp->barejid);
jid_destroy(jidp);
if (actor) {
g_string_append(message, " by ");
g_string_append(message, actor);
@@ -258,9 +248,8 @@ privwin_room_banned(ProfPrivateWin* privwin, const char* const actor, const char
privwin->room_left = TRUE;
GString* message = g_string_new("Banned from ");
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
g_string_append(message, jidp->barejid);
jid_destroy(jidp);
if (actor) {
g_string_append(message, " by ");
g_string_append(message, actor);

22
src/ui/rosterwin.c
View File

@@ -113,11 +113,10 @@ rosterwin_roster(void)
GList* curr = privchats;
while (curr) {
ProfPrivateWin* privwin = curr->data;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
if (!muc_active(jidp->barejid)) {
orphaned_privchats = g_list_append(orphaned_privchats, privwin);
}
jid_destroy(jidp);
curr = g_list_next(curr);
}
@@ -163,11 +162,10 @@ rosterwin_roster(void)
GList* curr = privchats;
while (curr) {
ProfPrivateWin* privwin = curr->data;
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
if (!muc_active(jidp->barejid)) {
orphaned_privchats = g_list_append(orphaned_privchats, privwin);
}
jid_destroy(jidp);
curr = g_list_next(curr);
}
@@ -677,13 +675,12 @@ _rosterwin_rooms_by_service(ProfLayoutSplit* layout)
GList* services = NULL;
while (curr) {
char* roomjid = curr->data;
Jid* jidp = jid_create(roomjid);
auto_jid Jid* jidp = jid_create(roomjid);
if (!g_list_find_custom(services, jidp->domainpart, (GCompareFunc)g_strcmp0)) {
services = g_list_insert_sorted(services, strdup(jidp->domainpart), (GCompareFunc)g_strcmp0);
}
jid_destroy(jidp);
curr = g_list_next(curr);
}
@@ -695,13 +692,12 @@ _rosterwin_rooms_by_service(ProfLayoutSplit* layout)
curr = rooms;
while (curr) {
char* roomjid = curr->data;
Jid* jidp = jid_create(roomjid);
auto_jid Jid* jidp = jid_create(roomjid);
if (g_strcmp0(curr_service->data, jidp->domainpart) == 0) {
filtered_rooms = g_list_append(filtered_rooms, strdup(jidp->barejid));
}
jid_destroy(jidp);
curr = g_list_next(curr);
}
@@ -754,9 +750,8 @@ _rosterwin_room(ProfLayoutSplit* layout, ProfMucWin* mucwin)
if (g_strcmp0(roombypref, "service") == 0) {
if (mucwin->room_name == NULL || (g_strcmp0(use_as_name, "jid") == 0)) {
Jid* jidp = jid_create(mucwin->roomjid);
auto_jid Jid* jidp = jid_create(mucwin->roomjid);
g_string_append(msg, jidp->localpart);
jid_destroy(jidp);
} else {
g_string_append(msg, mucwin->room_name);
}
@@ -770,15 +765,13 @@ _rosterwin_room(ProfLayoutSplit* layout, ProfMucWin* mucwin)
g_string_append(msg, mucwin->room_name);
}
} else {
Jid* jidp = jid_create(mucwin->roomjid);
auto_jid Jid* jidp = jid_create(mucwin->roomjid);
if (mucwin->room_name == NULL || (g_strcmp0(use_as_name, "jid") == 0)) {
g_string_append(msg, jidp->localpart);
} else {
g_string_append(msg, mucwin->room_name);
}
jid_destroy(jidp);
}
}
@@ -937,9 +930,8 @@ _rosterwin_private_chats(ProfLayoutSplit* layout, GList* orphaned_privchats)
g_string_append_printf(privmsg, " (%d)", privwin->unread);
}
Jid* jidp = jid_create(privwin->fulljid);
auto_jid Jid* jidp = jid_create(privwin->fulljid);
Occupant* occupant = muc_roster_item(jidp->barejid, jidp->resourcepart);
jid_destroy(jidp);
const char* presence = "offline";
if (occupant) {

18
src/ui/statusbar.c
View File

@@ -201,10 +201,9 @@ _create_tab(const int win, win_type_t wintype, char* identifier, gboolean highli
if (pcontact_name) {
tab->display_name = strdup(pcontact_name);
} else {
Jid* jidp = jid_create(tab->identifier);
auto_jid Jid* jidp = jid_create(tab->identifier);
if (jidp) {
tab->display_name = jidp->localpart != NULL ? strdup(jidp->localpart) : strdup(jidp->barejid);
jid_destroy(jidp);
} else {
tab->display_name = strdup(tab->identifier);
}
@@ -543,15 +542,13 @@ _status_bar_draw_maintext(int pos)
return pos;
}
if (g_strcmp0(pref, "user") == 0) {
Jid* jidp = jid_create(statusbar->fulljid);
auto_jid Jid* jidp = jid_create(statusbar->fulljid);
mvwprintw(statusbar_win, 0, pos, "%s", jidp->localpart);
jid_destroy(jidp);
return pos;
}
if (g_strcmp0(pref, "barejid") == 0) {
Jid* jidp = jid_create(statusbar->fulljid);
auto_jid Jid* jidp = jid_create(statusbar->fulljid);
mvwprintw(statusbar_win, 0, pos, "%s", jidp->barejid);
jid_destroy(jidp);
return pos;
}
@@ -655,9 +652,8 @@ _display_name(StatusBarTab* tab)
} else if (tab->window_type == WIN_MUC) {
auto_gchar gchar* pref = prefs_get_string(PREF_STATUSBAR_ROOM);
if (g_strcmp0("room", pref) == 0) {
Jid* jidp = jid_create(tab->identifier);
auto_jid Jid* jidp = jid_create(tab->identifier);
char* room = strdup(jidp->localpart);
jid_destroy(jidp);
fullname = room;
} else {
fullname = strdup(tab->identifier);
@@ -667,9 +663,8 @@ _display_name(StatusBarTab* tab)
GString* display_str = g_string_new("");
if (g_strcmp0("room", pref) == 0) {
Jid* jidp = jid_create(tab->identifier);
auto_jid Jid* jidp = jid_create(tab->identifier);
g_string_append(display_str, jidp->localpart);
jid_destroy(jidp);
} else {
g_string_append(display_str, tab->identifier);
}
@@ -682,11 +677,10 @@ _display_name(StatusBarTab* tab)
auto_gchar gchar* pref = prefs_get_string(PREF_STATUSBAR_ROOM);
if (g_strcmp0("room", pref) == 0) {
GString* display_str = g_string_new("");
Jid* jidp = jid_create(tab->identifier);
auto_jid Jid* jidp = jid_create(tab->identifier);
g_string_append(display_str, jidp->localpart);
g_string_append(display_str, "/");
g_string_append(display_str, jidp->resourcepart);
jid_destroy(jidp);
char* result = strdup(display_str->str);
g_string_free(display_str, TRUE);
fullname = result;

16
src/ui/window.c
View File

@@ -976,9 +976,8 @@ win_show_occupant_info(ProfWin* window, const char* const room, Occupant* occupa
win_println(window, THEME_DEFAULT, "!", " Affiliation: %s", occupant_affiliation);
win_println(window, THEME_DEFAULT, "!", " Role: %s", occupant_role);
Jid* jidp = jid_create_from_bare_and_resource(room, occupant->nick);
auto_jid Jid* jidp = jid_create_from_bare_and_resource(room, occupant->nick);
EntityCapabilities* caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp);
if (caps) {
// show identity
@@ -1099,9 +1098,8 @@ win_show_info(ProfWin* window, PContact contact)
}
win_newline(window);
Jid* jidp = jid_create_from_bare_and_resource(barejid, resource->name);
auto_jid Jid* jidp = jid_create_from_bare_and_resource(barejid, resource->name);
EntityCapabilities* caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp);
if (caps) {
// show identity
@@ -1496,7 +1494,7 @@ win_print_history(ProfWin* window, const ProfMessage* const message)
auto_gchar gchar* display_name;
int flags = 0;
const char* jid = connection_get_fulljid();
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (g_strcmp0(jidp->barejid, message->from_jid->barejid) == 0) {
display_name = strdup("me");
@@ -1505,8 +1503,6 @@ win_print_history(ProfWin* window, const ProfMessage* const message)
flags = NO_ME;
}
jid_destroy(jidp);
buffer_append(window->layout->buffer, "-", 0, message->timestamp, flags, THEME_TEXT_HISTORY, display_name, NULL, message->plain, NULL, NULL);
wins_add_urls_ac(window, message, FALSE);
wins_add_quotes_ac(window, message->plain, FALSE);
@@ -1521,10 +1517,10 @@ win_print_old_history(ProfWin* window, const ProfMessage* const message)
{
g_date_time_ref(message->timestamp);
auto_gchar gchar* display_name;
auto_char char* display_name;
int flags = 0;
const char* jid = connection_get_fulljid();
Jid* jidp = jid_create(jid);
auto_jid Jid* jidp = jid_create(jid);
if (g_strcmp0(jidp->barejid, message->from_jid->barejid) == 0) {
display_name = strdup("me");
@@ -1533,8 +1529,6 @@ win_print_old_history(ProfWin* window, const ProfMessage* const message)
flags = NO_ME;
}
jid_destroy(jidp);
buffer_prepend(window->layout->buffer, "-", 0, message->timestamp, flags, THEME_TEXT_HISTORY, display_name, NULL, message->plain, NULL, NULL);
wins_add_urls_ac(window, message, TRUE);
wins_add_quotes_ac(window, message->plain, TRUE);

8
src/ui/window_list.c
View File

@@ -276,13 +276,13 @@ wins_get_private_chats(const char* const roomjid)
void
wins_private_nick_change(const char* const roomjid, const char* const oldnick, const char* const newnick)
{
Jid* oldjid = jid_create_from_bare_and_resource(roomjid, oldnick);
auto_jid Jid* oldjid = jid_create_from_bare_and_resource(roomjid, oldnick);
ProfPrivateWin* privwin = wins_get_private(oldjid->fulljid);
if (privwin) {
free(privwin->fulljid);
Jid* newjid = jid_create_from_bare_and_resource(roomjid, newnick);
auto_jid Jid* newjid = jid_create_from_bare_and_resource(roomjid, newnick);
privwin->fulljid = strdup(newjid->fulljid);
win_println((ProfWin*)privwin, THEME_THEM, "!", "** %s is now known as %s.", oldjid->resourcepart, newjid->resourcepart);
@@ -290,11 +290,7 @@ wins_private_nick_change(const char* const roomjid, const char* const oldnick, c
autocomplete_remove(wins_close_ac, oldjid->fulljid);
autocomplete_add(wins_ac, newjid->fulljid);
autocomplete_add(wins_close_ac, newjid->fulljid);
jid_destroy(newjid);
}
jid_destroy(oldjid);
}
void