gaim/gaim

Fix some bugs. I don't understand why I don't get "might be used

2006-04-07, Mark Doliner
b7cecbe2bb3d
Parents ca7fe138b757
Children dc5b1f8ccb12
Fix some bugs. I don't understand why I don't get "might be used
uninitialized" warnings when I compile on my machine.
3 files changed, 4 insertions(+), 3 deletions(-)
  • +1 -1
    src/protocols/oscar/family_admin.c
  • +1 -1
    src/protocols/oscar/oscar.c
  • +2 -1
    src/protocols/oscar/peer_proxy.c
    • --- a/src/protocols/oscar/family_admin.c Fri Apr 07 01:14:16 2006 -0400
    +++ b/src/protocols/oscar/family_admin.c Fri Apr 07 10:13:44 2006 -0400
    @@ -182,7 +182,7 @@
    aim_snacid_t snacid;
    aim_tlvlist_t *tl = NULL;
    - flap_frame_new(od, 0x02, 10+2+2+strlen(newemail));
    + fr = flap_frame_new(od, 0x02, 10+2+2+strlen(newemail));
    snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
    aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid);
    --- a/src/protocols/oscar/oscar.c Fri Apr 07 01:14:16 2006 -0400
    +++ b/src/protocols/oscar/oscar.c Fri Apr 07 10:13:44 2006 -0400
    @@ -1623,7 +1623,7 @@
    separator = strchr(redir->ip, ':');
    if (separator != NULL)
    {
    - host = g_strndup(redir->ip, (int)separator - (int)host);
    + host = g_strndup(redir->ip, (int)separator - (int)redir->ip);
    port = atoi(separator + 1);
    }
    else
    --- a/src/protocols/oscar/peer_proxy.c Fri Apr 07 01:14:16 2006 -0400
    +++ b/src/protocols/oscar/peer_proxy.c Fri Apr 07 10:13:44 2006 -0400
    @@ -304,10 +304,11 @@
    peer_connection_trynext(conn);
    return;
    }
    +
    + frame->payload.offset += read;
    }
    conn->lastactivity = time(NULL);
    - frame->payload.offset += read;
    if (frame->payload.offset < frame->payload.len)
    /* Waiting for more data to arrive */
    return;