Ignore:
Timestamp:
2015-02-20T22:50:54Z (10 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
0b9daac, 3d45471, 7733b8c
Parents:
af359b4
git-author:
Indent <please@…> (19-02-15 05:47:20)
git-committer:
dequis <dx@…> (20-02-15 22:50:54)
Message:

Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg

Commit author set to "Indent <please@…>" so that it's easier to
skip while doing git blame.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/purple/ft-direct.c

    raf359b4 r5ebff60  
    3434#include <purple.h>
    3535
    36 struct prpl_xfer_data
    37 {
     36struct prpl_xfer_data {
    3837        PurpleXfer *xfer;
    3938        file_transfer_t *ft;
     
    4544static file_transfer_t *next_ft;
    4645
    47 struct im_connection *purple_ic_by_pa( PurpleAccount *pa );
     46struct im_connection *purple_ic_by_pa(PurpleAccount *pa);
    4847
    4948/* Glorious hack: We seem to have to remind at least some libpurple plugins
    5049   that we're ready because this info may get lost if we give it too early.
    5150   So just do it ten times a second. :-/ */
    52 static gboolean prplcb_xfer_write_request_cb( gpointer data, gint fd, b_input_condition cond )
     51static gboolean prplcb_xfer_write_request_cb(gpointer data, gint fd, b_input_condition cond)
    5352{
    5453        struct prpl_xfer_data *px = data;
    55        
    56         purple_xfer_ui_ready( px->xfer );
    57        
    58         return purple_xfer_get_type( px->xfer ) == PURPLE_XFER_RECEIVE;
    59 }
    60 
    61 static gboolean prpl_xfer_write_request( struct file_transfer *ft )
    62 {
    63         struct prpl_xfer_data *px = ft->data;
    64         px->ready_timer = b_timeout_add( 100, prplcb_xfer_write_request_cb, px );
     54
     55        purple_xfer_ui_ready(px->xfer);
     56
     57        return purple_xfer_get_type(px->xfer) == PURPLE_XFER_RECEIVE;
     58}
     59
     60static gboolean prpl_xfer_write_request(struct file_transfer *ft)
     61{
     62        struct prpl_xfer_data *px = ft->data;
     63
     64        px->ready_timer = b_timeout_add(100, prplcb_xfer_write_request_cb, px);
    6565        return TRUE;
    6666}
    6767
    68 static gboolean prpl_xfer_write( struct file_transfer *ft, char *buffer, unsigned int len )
    69 {
    70         struct prpl_xfer_data *px = ft->data;
    71        
    72         px->buf = g_memdup( buffer, len );
     68static gboolean prpl_xfer_write(struct file_transfer *ft, char *buffer, unsigned int len)
     69{
     70        struct prpl_xfer_data *px = ft->data;
     71
     72        px->buf = g_memdup(buffer, len);
    7373        px->buf_len = len;
    7474
    7575        //purple_xfer_ui_ready( px->xfer );
    76         px->ready_timer = b_timeout_add( 0, prplcb_xfer_write_request_cb, px );
    77        
     76        px->ready_timer = b_timeout_add(0, prplcb_xfer_write_request_cb, px);
     77
    7878        return TRUE;
    7979}
    8080
    81 static void prpl_xfer_accept( struct file_transfer *ft )
    82 {
    83         struct prpl_xfer_data *px = ft->data;
    84         purple_xfer_request_accepted( px->xfer, NULL );
    85         prpl_xfer_write_request( ft );
    86 }
    87 
    88 static void prpl_xfer_canceled( struct file_transfer *ft, char *reason )
    89 {
    90         struct prpl_xfer_data *px = ft->data;
    91         purple_xfer_request_denied( px->xfer );
    92 }
    93 
    94 static gboolean prplcb_xfer_new_send_cb( gpointer data, gint fd, b_input_condition cond )
     81static void prpl_xfer_accept(struct file_transfer *ft)
     82{
     83        struct prpl_xfer_data *px = ft->data;
     84
     85        purple_xfer_request_accepted(px->xfer, NULL);
     86        prpl_xfer_write_request(ft);
     87}
     88
     89static void prpl_xfer_canceled(struct file_transfer *ft, char *reason)
     90{
     91        struct prpl_xfer_data *px = ft->data;
     92
     93        purple_xfer_request_denied(px->xfer);
     94}
     95
     96static gboolean prplcb_xfer_new_send_cb(gpointer data, gint fd, b_input_condition cond)
    9597{
    9698        PurpleXfer *xfer = data;
    97         struct im_connection *ic = purple_ic_by_pa( xfer->account );
    98         struct prpl_xfer_data *px = g_new0( struct prpl_xfer_data, 1 );
     99        struct im_connection *ic = purple_ic_by_pa(xfer->account);
     100        struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
    99101        PurpleBuddy *buddy;
    100102        const char *who;
    101        
    102         buddy = purple_find_buddy( xfer->account, xfer->who );
    103         who = buddy ? purple_buddy_get_name( buddy ) : xfer->who;
    104        
     103
     104        buddy = purple_find_buddy(xfer->account, xfer->who);
     105        who = buddy ? purple_buddy_get_name(buddy) : xfer->who;
     106
    105107        /* TODO(wilmer): After spreading some more const goodness in BitlBee,
    106108           remove the evil cast below. */
    107         px->ft = imcb_file_send_start( ic, (char*) who, xfer->filename, xfer->size );
     109        px->ft = imcb_file_send_start(ic, (char *) who, xfer->filename, xfer->size);
    108110        px->ft->data = px;
    109111        px->xfer = data;
    110112        px->xfer->ui_data = px;
    111        
     113
    112114        px->ft->accept = prpl_xfer_accept;
    113115        px->ft->canceled = prpl_xfer_canceled;
    114116        px->ft->write_request = prpl_xfer_write_request;
    115        
     117
    116118        return FALSE;
    117119}
    118120
    119 static void prplcb_xfer_new( PurpleXfer *xfer )
    120 {
    121         if( purple_xfer_get_type( xfer ) == PURPLE_XFER_RECEIVE )
    122         {
     121static void prplcb_xfer_new(PurpleXfer *xfer)
     122{
     123        if (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE) {
    123124                /* This should suppress the stupid file dialog. */
    124                 purple_xfer_set_local_filename( xfer, "/tmp/wtf123" );
    125                
     125                purple_xfer_set_local_filename(xfer, "/tmp/wtf123");
     126
    126127                /* Sadly the xfer struct is still empty ATM so come back after
    127128                   the caller is done. */
    128                 b_timeout_add( 0, prplcb_xfer_new_send_cb, xfer );
    129         }
    130         else
    131         {
    132                 struct prpl_xfer_data *px = g_new0( struct prpl_xfer_data, 1 );
    133                
     129                b_timeout_add(0, prplcb_xfer_new_send_cb, xfer);
     130        } else {
     131                struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
     132
    134133                px->ft = next_ft;
    135134                px->ft->data = px;
    136135                px->xfer = xfer;
    137136                px->xfer->ui_data = px;
    138                
    139                 purple_xfer_set_filename( xfer, px->ft->file_name );
    140                 purple_xfer_set_size( xfer, px->ft->file_size );
    141                
     137
     138                purple_xfer_set_filename(xfer, px->ft->file_name);
     139                purple_xfer_set_size(xfer, px->ft->file_size);
     140
    142141                next_ft = NULL;
    143142        }
    144143}
    145144
    146 static void prplcb_xfer_progress( PurpleXfer *xfer, double percent )
    147 {
    148         fprintf( stderr, "prplcb_xfer_dbg 0x%p %f\n", xfer, percent );
    149 }
    150 
    151 static void prplcb_xfer_dbg( PurpleXfer *xfer )
    152 {
    153         fprintf( stderr, "prplcb_xfer_dbg 0x%p\n", xfer );
    154 }
    155 
    156 static gssize prplcb_xfer_write( PurpleXfer *xfer, const guchar *buffer, gssize size )
     145static void prplcb_xfer_progress(PurpleXfer *xfer, double percent)
     146{
     147        fprintf(stderr, "prplcb_xfer_dbg 0x%p %f\n", xfer, percent);
     148}
     149
     150static void prplcb_xfer_dbg(PurpleXfer *xfer)
     151{
     152        fprintf(stderr, "prplcb_xfer_dbg 0x%p\n", xfer);
     153}
     154
     155static gssize prplcb_xfer_write(PurpleXfer *xfer, const guchar *buffer, gssize size)
    157156{
    158157        struct prpl_xfer_data *px = xfer->ui_data;
    159158        gboolean st;
    160        
    161         fprintf( stderr, "xfer_write %d %d\n", size, px->buf_len );
    162        
    163         b_event_remove( px->ready_timer );
     159
     160        fprintf(stderr, "xfer_write %d %d\n", size, px->buf_len);
     161
     162        b_event_remove(px->ready_timer);
    164163        px->ready_timer = 0;
    165        
    166         st = px->ft->write( px->ft, (char*) buffer, size );
    167        
    168         if( st && xfer->bytes_remaining == size )
    169                 imcb_file_finished( px->ft );
    170        
     164
     165        st = px->ft->write(px->ft, (char *) buffer, size);
     166
     167        if (st && xfer->bytes_remaining == size) {
     168                imcb_file_finished(px->ft);
     169        }
     170
    171171        return st ? size : 0;
    172172}
    173173
    174 gssize prplcb_xfer_read( PurpleXfer *xfer, guchar **buffer, gssize size )
     174gssize prplcb_xfer_read(PurpleXfer *xfer, guchar **buffer, gssize size)
    175175{
    176176        struct prpl_xfer_data *px = xfer->ui_data;
    177        
    178         fprintf( stderr, "xfer_read %d %d\n", size, px->buf_len );
    179 
    180         if( px->buf )
    181         {
     177
     178        fprintf(stderr, "xfer_read %d %d\n", size, px->buf_len);
     179
     180        if (px->buf) {
    182181                *buffer = px->buf;
    183182                px->buf = NULL;
    184                
    185                 px->ft->write_request( px->ft );
    186                
     183
     184                px->ft->write_request(px->ft);
     185
    187186                return px->buf_len;
    188187        }
    189        
     188
    190189        return 0;
    191190}
     
    204203};
    205204
    206 static gboolean prplcb_xfer_send_cb( gpointer data, gint fd, b_input_condition cond );
    207 
    208 void purple_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *handle )
     205static gboolean prplcb_xfer_send_cb(gpointer data, gint fd, b_input_condition cond);
     206
     207void purple_transfer_request(struct im_connection *ic, file_transfer_t *ft, char *handle)
    209208{
    210209        PurpleAccount *pa = ic->proto_data;
    211210        struct prpl_xfer_data *px;
    212        
     211
    213212        /* xfer_new() will pick up this variable. It's a hack but we're not
    214213           multi-threaded anyway. */
    215214        next_ft = ft;
    216         serv_send_file( purple_account_get_connection( pa ), handle, ft->file_name );
    217        
     215        serv_send_file(purple_account_get_connection(pa), handle, ft->file_name);
     216
    218217        ft->write = prpl_xfer_write;
    219        
     218
    220219        px = ft->data;
    221         imcb_file_recv_start( ft );
    222        
    223         px->ready_timer = b_timeout_add( 100, prplcb_xfer_send_cb, px );
    224 }
    225 
    226 static gboolean prplcb_xfer_send_cb( gpointer data, gint fd, b_input_condition cond )
     220        imcb_file_recv_start(ft);
     221
     222        px->ready_timer = b_timeout_add(100, prplcb_xfer_send_cb, px);
     223}
     224
     225static gboolean prplcb_xfer_send_cb(gpointer data, gint fd, b_input_condition cond)
    227226{
    228227        struct prpl_xfer_data *px = data;
    229        
    230         if( px->ft->status & FT_STATUS_TRANSFERRING )
    231         {
    232                 fprintf( stderr, "The ft, it is ready...\n" );
    233                 px->ft->write_request( px->ft );
    234                
     228
     229        if (px->ft->status & FT_STATUS_TRANSFERRING) {
     230                fprintf(stderr, "The ft, it is ready...\n");
     231                px->ft->write_request(px->ft);
     232
    235233                return FALSE;
    236234        }
    237        
     235
    238236        return TRUE;
    239237}
Note: See TracChangeset for help on using the changeset viewer.