pidgin/pidgin

Re-arrange some NULL checks.

2019-11-03, Elliott Sales de Andrade
649d1bfd0ecc
Parents 2e1969768857
Children 3682f08744da
Re-arrange some NULL checks.
1 files changed, 11 insertions(+), 7 deletions(-)
  • +11 -7
    libpurple/protocols/novell/nmconn.c
    • --- a/libpurple/protocols/novell/nmconn.c Sun Nov 03 20:27:37 2019 -0500
    +++ b/libpurple/protocols/novell/nmconn.c Sun Nov 03 22:42:44 2019 -0500
    @@ -192,9 +192,10 @@
    int val = 0;
    g_return_val_if_fail(user != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(user->conn != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(fields != NULL, NMERR_BAD_PARM);
    +
    conn = user->conn;
    - g_return_val_if_fail(conn != NULL, NMERR_BAD_PARM);
    - g_return_val_if_fail(fields != NULL, NMERR_BAD_PARM);
    /* Format each field as valid "post" data and write it out */
    for (field = fields; (rc == NM_OK) && (field->tag); field++) {
    @@ -318,9 +319,10 @@
    char *str = NULL;
    g_return_val_if_fail(user != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(user->conn != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(cmd != NULL, NMERR_BAD_PARM);
    +
    conn = user->conn;
    - g_return_val_if_fail(conn != NULL, NMERR_BAD_PARM);
    - g_return_val_if_fail(cmd != NULL, NMERR_BAD_PARM);
    /* Write the post */
    bytes_to_send = g_snprintf(buffer, sizeof(buffer),
    @@ -408,8 +410,9 @@
    GError *error = NULL;
    g_return_val_if_fail(user != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(user->conn != NULL, NMERR_BAD_PARM);
    +
    conn = user->conn;
    - g_return_val_if_fail(conn != NULL, NMERR_BAD_PARM);
    buffer = g_data_input_stream_read_line(conn->input, NULL, user->cancellable,
    &error);
    @@ -469,9 +472,10 @@
    GError *error = NULL;
    g_return_val_if_fail(user != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(user->conn != NULL, NMERR_BAD_PARM);
    + g_return_val_if_fail(fields != NULL, NMERR_BAD_PARM);
    +
    conn = user->conn;
    - g_return_val_if_fail(conn != NULL, NMERR_BAD_PARM);
    - g_return_val_if_fail(fields != NULL, NMERR_BAD_PARM);
    do {
    if (count > 0) {