diff -r 04cf8cbe44d8 -r 5061721fd98f libpurple/protocols/novell/nmevent.c --- a/libpurple/protocols/novell/nmevent.c Mon Dec 21 14:50:43 2015 -0500 +++ b/libpurple/protocols/novell/nmevent.c Mon Dec 21 15:00:42 2015 -0500 @@ -241,14 +241,9 @@ nm_release_conference(conference); } - if (msg) - g_free(msg); - - if (nortf) - g_free(nortf); - - if (guid) - g_free(guid); + g_free(msg); + g_free(nortf); + g_free(guid); return rc; } @@ -323,11 +318,8 @@ } } - if (msg) - g_free(msg); - - if (guid) - g_free(guid); + g_free(msg); + g_free(guid); return rc; } @@ -381,8 +373,7 @@ } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -417,8 +408,7 @@ } } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -468,8 +458,7 @@ } } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -507,8 +496,7 @@ } } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -569,8 +557,7 @@ } } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -605,8 +592,7 @@ } } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -651,8 +637,7 @@ } } - if (text) - g_free(text); + g_free(text); return rc; } @@ -677,8 +662,7 @@ rc = nm_read_all(conn, guid, size); } - if (guid) - g_free(guid); + g_free(guid); return rc; } @@ -712,8 +696,7 @@ if (--(event->ref_count) == 0) { - if (event->source) - g_free(event->source); + g_free(event->source); if (event->conference) nm_release_conference(event->conference); @@ -721,8 +704,7 @@ if (event->user_record) nm_release_user_record(event->user_record); - if (event->text) - g_free(event->text); + g_free(event->text); g_free(event); } @@ -936,8 +918,7 @@ } /* Cleanup */ - if (source) - g_free(source); + g_free(source); return rc; }