Changeset d2b3f25


Ignore:
Timestamp:
2014-10-27T08:05:44Z (5 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
81186736
Parents:
fef97af (diff), b6bd99c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging warning fixes from dx.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • dcc.c

    rfef97af rd2b3f25  
    385385                                b_event_remove( df->watch_out );
    386386
     387                        df->watch_in = 0;
     388
    387389                        if( df->proto_finished )
    388390                                dcc_finish( ft );
    389391
    390                         df->watch_in = 0;
    391392                        return FALSE;
    392393                }
  • lib/ftutil.c

    rfef97af rd2b3f25  
    138138
    139139        /* I hate static-length strings.. */
    140         host[HOST_NAME_MAX] = '\0';
     140        host[HOST_NAME_MAX-1] = '\0';
    141141        port[5] = '\0';
    142142       
  • lib/http_client.c

    rfef97af rd2b3f25  
    211211       
    212212        if( req->inpa > 0 )
     213        {
    213214                b_event_remove( req->inpa );
     215                req->inpa = 0;
     216        }
    214217       
    215218        if( req->ssl )
  • protocols/jabber/s5bytestream.c

    rfef97af rd2b3f25  
    123123
    124124        if ( tf->watch_in )
     125        {
    125126                b_event_remove( tf->watch_in );
     127                tf->watch_in = 0;
     128        }
    126129       
    127130        if( tf->watch_out )
     131        {
    128132                b_event_remove( tf->watch_out );
     133                tf->watch_out = 0;
     134        }
    129135       
    130136        g_free( bt->pseudoadr );
  • protocols/jabber/si.c

    rfef97af rd2b3f25  
    3535
    3636        if ( tf->watch_in )
     37        {
    3738                b_event_remove( tf->watch_in );
     39                tf->watch_in = 0;
     40        }
    3841
    3942        jd->filetransfers = g_slist_remove( jd->filetransfers, tf );
Note: See TracChangeset for help on using the changeset viewer.