diff options
| author | Marius Halden <marius.h@lden.org> | 2016-12-27 14:13:51 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-12-27 14:13:51 +0100 |
| commit | d35affbcea87f453fb20c4bb545a10b668eae81b (patch) | |
| tree | a6856cc15f6ba10c79d737a61e2773cba12bf558 /protocols/oscar/rxhandlers.c | |
| parent | 184c46d3507a0ff9fc68a4409f690add96cd183d (diff) | |
| parent | 9cdcef077ed523966f508a3721944a16425734cb (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/oscar/rxhandlers.c')
| -rw-r--r-- | protocols/oscar/rxhandlers.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/protocols/oscar/rxhandlers.c b/protocols/oscar/rxhandlers.c index 6ff106b2..0f1bb3d7 100644 --- a/protocols/oscar/rxhandlers.c +++ b/protocols/oscar/rxhandlers.c @@ -234,14 +234,8 @@ int aim_conn_addhandler(aim_session_t *sess, aim_conn_t *conn, guint16 family, g { struct aim_rxcblist_s *newcb; - if (!conn) { - return -1; - } - - if (checkdisallowed(family, type)) { - g_assert(0); - return -1; - } + g_return_val_if_fail(conn, -1); + g_return_val_if_fail(checkdisallowed(family, type), -1); if (!(newcb = (struct aim_rxcblist_s *) g_new0(struct aim_rxcblist_s, 1))) { return -1; |