--- a/mcabber/src/commands.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/commands.c Sat Mar 25 18:16:10 2006 +0100
@@ -1467,7 +1467,7 @@
reason_utf8 = to_utf8(arg);
jb_room_invite(roomname, jid, reason_utf8);
scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>...", jid);
- if (reason_utf8) g_free(reason_utf8);
+ g_free(reason_utf8);
free_arg_lst(paramlst);
}
@@ -1500,8 +1500,8 @@
jid_utf8 = to_utf8(jid);
reason_utf8 = to_utf8(arg);
jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
- if (jid_utf8) g_free(jid_utf8);
- if (reason_utf8) g_free(reason_utf8);
+ g_free(jid_utf8);
+ g_free(reason_utf8);
} else
scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter.");
@@ -1537,8 +1537,8 @@
jid_utf8 = to_utf8(jid);
reason_utf8 = to_utf8(arg);
jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
- if (jid_utf8) g_free(jid_utf8);
- if (reason_utf8) g_free(reason_utf8);
+ g_free(jid_utf8);
+ g_free(reason_utf8);
} else
scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");
@@ -1571,8 +1571,8 @@
jid_utf8 = to_utf8(jid);
reason_utf8 = to_utf8(arg);
jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
- if (jid_utf8) g_free(jid_utf8);
- if (reason_utf8) g_free(reason_utf8);
+ g_free(jid_utf8);
+ g_free(reason_utf8);
free_arg_lst(paramlst);
}
@@ -1602,8 +1602,8 @@
nick_utf8 = to_utf8(nick);
reason_utf8 = to_utf8(arg);
jb_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8);
- if (nick_utf8) g_free(nick_utf8);
- if (reason_utf8) g_free(reason_utf8);
+ g_free(nick_utf8);
+ g_free(reason_utf8);
free_arg_lst(paramlst);
}
@@ -1726,7 +1726,7 @@
msg = NULL;
jb_room_destroy(buddy_getjid(bud), NULL, msg);
- if (msg) g_free(msg);
+ g_free(msg);
}
static void room_unlock(gpointer bud, char *arg)
--- a/mcabber/src/events.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/events.c Sat Mar 25 18:16:10 2006 +0100
@@ -73,8 +73,8 @@
if (p) {
g_free(i->id);
if (i->xmldata) xmlnode_free(i->xmldata);
- if (i->data) g_free(i->data);
- if (i->desc) g_free(i->desc);
+ g_free(i->data);
+ g_free(i->desc);
g_free(i);
evs_list = g_slist_remove(evs_list, p->data);
return 0; // Ok, deleted
--- a/mcabber/src/histolog.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/histolog.c Sat Mar 25 18:16:10 2006 +0100
@@ -275,8 +275,7 @@
UseFileLogging = FileLoadLogs = FALSE;
}
} else { // Disable history logging
- if (RootDir)
- g_free(RootDir);
+ g_free(RootDir);
}
}
--- a/mcabber/src/hooks.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/hooks.c Sat Mar 25 18:16:10 2006 +0100
@@ -73,8 +73,8 @@
roster_usr = roster_add_user(jid, NULL, NULL, rtype, sub_none);
if (!roster_usr) { // Shouldn't happen...
scr_LogPrint(LPRINT_LOGNORM, "ERROR: unable to add buddy!");
- if (bmsg) g_free(bmsg);
- if (mmsg) g_free(mmsg);
+ g_free(bmsg);
+ g_free(mmsg);
return;
}
} else if (is_groupchat) {
@@ -147,8 +147,8 @@
update_roster = TRUE;
}
- if (bmsg) g_free(bmsg);
- if (mmsg) g_free(mmsg);
+ g_free(bmsg);
+ g_free(mmsg);
}
// hk_message_out()
@@ -182,8 +182,8 @@
// External command
hk_ext_cmd(jid, 'M', 'S', NULL);
- if (bmsg) g_free(bmsg);
- if (mmsg) g_free(mmsg);
+ g_free(bmsg);
+ g_free(mmsg);
}
inline void hk_statuschange(const char *jid, const char *resname, gchar prio,
@@ -339,8 +339,7 @@
if ((pid=fork()) == -1) {
scr_LogPrint(LPRINT_LOGNORM, "Fork error, cannot launch external command.");
- if (datafname)
- g_free(datafname);
+ g_free(datafname);
return;
}
@@ -354,8 +353,7 @@
exit(1);
}
}
- if (datafname)
- g_free(datafname);
+ g_free(datafname);
}
/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
--- a/mcabber/src/jab_iq.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/jab_iq.c Sat Mar 25 18:16:10 2006 +0100
@@ -79,8 +79,8 @@
}
if (p) {
g_free(i->id);
- if (i->xmldata) xmlnode_free(i->xmldata);
- if (i->data) g_free(i->data);
+ xmlnode_free(i->xmldata);
+ g_free(i->data);
g_free(i);
iqs_list = g_slist_remove(iqs_list, p->data);
return 0; // Ok, deleted
--- a/mcabber/src/jabglue.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/jabglue.c Sat Mar 25 18:16:10 2006 +0100
@@ -367,8 +367,7 @@
hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
mystatus = st;
if (msg != mystatusmsg) {
- if (mystatusmsg)
- g_free(mystatusmsg);
+ g_free(mystatusmsg);
if (*msg)
mystatusmsg = g_strdup(msg);
else
@@ -1318,8 +1317,7 @@
}
if (from && body)
gotmessage(type, from, body, enc, timestamp);
- if (tmp)
- g_free(tmp);
+ g_free(tmp);
}
static void evscallback_subscription(eviqs *evp, guint evcontext)
--- a/mcabber/src/main.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/main.c Sat Mar 25 18:16:10 2006 +0100
@@ -221,7 +221,7 @@
/* Parsing config file... */
ret = cfg_read_file(configFile);
/* free() configFile if it has been allocated during options parsing */
- if (configFile) g_free(configFile);
+ g_free(configFile);
/* Leave if there was an error in the config. file */
if (ret)
exit(EXIT_FAILURE);
--- a/mcabber/src/roster.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/roster.c Sat Mar 25 18:16:10 2006 +0100
@@ -99,15 +99,9 @@
for ( lip = *reslist; lip ; lip = g_slist_next(lip)) {
p_res = (res*)lip->data;
- if (p_res->status_msg) {
- g_free((gchar*)p_res->status_msg);
- }
- if (p_res->name) {
- g_free((gchar*)p_res->name);
- }
- if (p_res->realjid) {
- g_free((gchar*)p_res->realjid);
- }
+ g_free((gchar*)p_res->status_msg);
+ g_free((gchar*)p_res->name);
+ g_free((gchar*)p_res->realjid);
}
// Free all nodes but the first (which is static)
g_slist_free(*reslist);
@@ -191,9 +185,9 @@
p_res = p_res_elt->data;
// Free allocations and delete resource node
- if (p_res->name) g_free(p_res->name);
- if (p_res->status_msg) g_free(p_res->status_msg);
- if (p_res->realjid) g_free(p_res->realjid);
+ g_free(p_res->name);
+ g_free(p_res->status_msg);
+ g_free(p_res->realjid);
rost->resource = g_slist_delete_link(rost->resource, p_res_elt);
return;
}
@@ -366,10 +360,10 @@
unread_jid_add(roster_usr->jid);
// Let's free memory (jid, name, status message)
- if (roster_usr->jid) g_free((gchar*)roster_usr->jid);
- if (roster_usr->name) g_free((gchar*)roster_usr->name);
- if (roster_usr->nickname) g_free((gchar*)roster_usr->nickname);
- if (roster_usr->topic) g_free((gchar*)roster_usr->topic);
+ g_free((gchar*)roster_usr->jid);
+ g_free((gchar*)roster_usr->name);
+ g_free((gchar*)roster_usr->nickname);
+ g_free((gchar*)roster_usr->topic);
free_all_resources(&roster_usr->resource);
g_free(roster_usr);
@@ -408,10 +402,10 @@
if (roster_usr->flags & ROSTER_FLAG_MSG)
unread_jid_add(roster_usr->jid);
// Free name and jid
- if (roster_usr->jid) g_free((gchar*)roster_usr->jid);
- if (roster_usr->name) g_free((gchar*)roster_usr->name);
- if (roster_usr->nickname) g_free((gchar*)roster_usr->nickname);
- if (roster_usr->topic) g_free((gchar*)roster_usr->topic);
+ g_free((gchar*)roster_usr->jid);
+ g_free((gchar*)roster_usr->name);
+ g_free((gchar*)roster_usr->nickname);
+ g_free((gchar*)roster_usr->topic);
free_all_resources(&roster_usr->resource);
g_free(roster_usr);
sl_usr = g_slist_next(sl_usr);
@@ -420,8 +414,8 @@
if (roster_grp->list)
g_slist_free(roster_grp->list);
// Free group's name and jid
- if (roster_grp->jid) g_free((gchar*)roster_grp->jid);
- if (roster_grp->name) g_free((gchar*)roster_grp->name);
+ g_free((gchar*)roster_grp->jid);
+ g_free((gchar*)roster_grp->name);
g_free(roster_grp);
sl_grp = g_slist_next(sl_grp);
}
@@ -803,8 +797,8 @@
// Remove old group if it is empty
if (!*sl_group) {
roster *roster_grp = (roster*)((GSList*)roster_usr->list)->data;
- if (roster_grp->jid) g_free((gchar*)roster_grp->jid);
- if (roster_grp->name) g_free((gchar*)roster_grp->name);
+ g_free((gchar*)roster_grp->jid);
+ g_free((gchar*)roster_grp->name);
g_free(roster_grp);
groups = g_slist_remove(groups, roster_grp);
}
--- a/mcabber/src/settings.c Sat Mar 25 18:14:37 2006 +0100
+++ b/mcabber/src/settings.c Sat Mar 25 18:16:10 2006 +0100
@@ -165,7 +165,7 @@
// If this isn't a assignment (no = char), the function will set *pval
// to NULL and return FALSE.
//
-// The called should g_free() *pkey and *pval (if not NULL) after use.
+// The caller should g_free() *pkey and *pval (if not NULL) after use.
guint parse_assigment(gchar *assignment, const gchar **pkey, const gchar **pval)
{
char *key, *val, *t, *p;
@@ -239,8 +239,7 @@
if (sptr) {
// The setting has been found. We will update it or delete it.
setting = (T_setting*)sptr->data;
- if (setting->value)
- g_free(setting->value);
+ g_free(setting->value);
if (!value) {
// Let's remove the setting
g_free(setting->name);