pidgin/pidgin

Move g_return_if_fail to top of function and exit early.
release-2.x.y
2014-01-19, Mark Doliner
c3077dd1c5c7
Parents 0c9bbd23c7d4
Children 5d5e240a469c
Move g_return_if_fail to top of function and exit early.

This way the meat of the function isn't needlessly indented.
I think it's easier to read code structured this way.
1 files changed, 11 insertions(+), 11 deletions(-)
  • +11 -11
    libpurple/protocols/jabber/bosh.c
    • --- a/libpurple/protocols/jabber/bosh.c Sun Jan 19 18:30:20 2014 -0800
    +++ b/libpurple/protocols/jabber/bosh.c Sun Jan 19 20:26:01 2014 -0800
    @@ -623,24 +623,24 @@
    static void
    http_received_cb(const char *data, int len, PurpleBOSHConnection *conn)
    {
    + xmlnode *node;
    +
    if (conn->failed_connections)
    /* We've got some data, so reset the number of failed connections */
    conn->failed_connections = 0;
    - if (conn->receive_cb) {
    - xmlnode *node = xmlnode_from_str(data, len);
    + g_return_if_fail(conn->receive_cb);
    - purple_debug_info("jabber", "RecvBOSH %s(%d): %s\n",
    - conn->ssl ? "(ssl)" : "", len, data);
    + node = xmlnode_from_str(data, len);
    - if (node) {
    - conn->receive_cb(conn, node);
    - xmlnode_free(node);
    - } else {
    - purple_debug_warning("jabber", "BOSH: Received invalid XML\n");
    - }
    + purple_debug_info("jabber", "RecvBOSH %s(%d): %s\n",
    + conn->ssl ? "(ssl)" : "", len, data);
    +
    + if (node) {
    + conn->receive_cb(conn, node);
    + xmlnode_free(node);
    } else {
    - g_return_if_reached();
    + purple_debug_warning("jabber", "BOSH: Received invalid XML\n");
    }
    }