Ignore:
Timestamp:
2010-07-23T14:35:45Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
9034ba0
Parents:
938c305
Message:

This should mostly be a no-op, merging *loads* of whitespace changes from
libyahoo2 so that I can see better what really changed.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/yahoo/yahoo2_callbacks.h

    r938c305 rc36f73b  
    3030 */
    3131
    32 
    3332#ifndef YAHOO2_CALLBACKS_H
    3433#define YAHOO2_CALLBACKS_H
    … …  
    4645 */
    4746
    48 typedef enum {
    49         YAHOO_INPUT_READ = 1 << 0,
    50         YAHOO_INPUT_WRITE = 1 << 1,
    51         YAHOO_INPUT_EXCEPTION = 1 << 2
    52 } yahoo_input_condition;
     47        typedef enum {
     48                YAHOO_INPUT_READ = 1 << 0,
     49                YAHOO_INPUT_WRITE = 1 << 1,
     50                YAHOO_INPUT_EXCEPTION = 1 << 2
     51        } yahoo_input_condition;
    5352
    5453/*
    … …  
    9493 *      url  - url to reactivate account if locked
    9594 */
    96 void YAHOO_CALLBACK_TYPE(ext_yahoo_login_response)(int id, int succ, const char *url);
    97 
     95        void YAHOO_CALLBACK_TYPE(ext_yahoo_login_response) (int id, int succ,
     96                const char *url);
    9897
    9998/*
    … …  
    104103 *      buds - the buddy list
    105104 */
    106 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddies)(int id, YList * buds);
    107 
     105        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddies) (int id, YList *buds);
    108106
    109107/*
    … …  
    114112 *      igns - the ignore list
    115113 */
    116 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ignore)(int id, YList * igns);
    117 
     114        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ignore) (int id, YList *igns);
    118115
    119116/*
    … …  
    124121 *      ids  - the identity list
    125122 */
    126 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_identities)(int id, YList * ids);
    127 
     123        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_identities) (int id, YList *ids);
    128124
    129125/*
    … …  
    133129 *      id   - the id that identifies the server connection
    134130 */
    135 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_cookies)(int id);
    136 
     131        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_cookies) (int id);
    137132
    138133/*
    … …  
    143138 *  errormsg - optional error message
    144139 */
    145 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ping)(int id, const char *errormsg);
    146 
     140        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ping) (int id,
     141                const char *errormsg);
    147142
    148143/*
    … …  
    159154 *      TODO: add support for pager, chat, and game states
    160155 */
    161 void YAHOO_CALLBACK_TYPE(ext_yahoo_status_changed)(int id, const char *who, int stat, const char *msg, int away, int idle, int mobile);
    162 
     156        void YAHOO_CALLBACK_TYPE(ext_yahoo_status_changed) (int id,
     157                const char *who, int stat, const char *msg, int away, int idle,
     158                int mobile);
     159
     160/*
     161 * Name: ext_yahoo_got_buzz
     162 *      Called when remote user sends you a buzz.
     163 * Params:
     164 *      id   - the id that identifies the server connection
     165 *      me   - the identity the message was sent to
     166 *      who  - the handle of the remote user
     167 *      tm   - timestamp of message if offline
     168 */
     169        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buzz) (int id, const char *me,
     170                const char *who, long tm);
    163171
    164172/*
    … …  
    177185 *      utf8 - whether the message is encoded as utf8 or not
    178186 */
    179 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_im)(int id, const char *me, const char *who, const char *msg, long tm, int stat, int utf8);
    180 
     187        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_im) (int id, const char *me,
     188                const char *who, const char *msg, long tm, int stat, int utf8);
    181189
    182190/*
    … …  
    191199 *      members - the initial members of the conference (null terminated list)
    192200 */
    193 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_conf_invite)(int id, const char *me, const char *who, const char *room, const char *msg, YList *members);
    194 
     201        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_conf_invite) (int id,
     202                const char *me, const char *who, const char *room,
     203                const char *msg, YList *members);
    195204
    196205/*
    … …  
    204213 *      msg  - the declining message
    205214 */
    206 void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userdecline)(int id, const char *me, const char *who, const char *room, const char *msg);
    207 
     215        void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userdecline) (int id,
     216                const char *me, const char *who, const char *room,
     217                const char *msg);
    208218
    209219/*
    … …  
    216226 *      room - the room joined
    217227 */
    218 void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userjoin)(int id, const char *me, const char *who, const char *room);
    219 
     228        void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userjoin) (int id,
     229                const char *me, const char *who, const char *room);
    220230
    221231/*
    … …  
    228238 *      room - the room left
    229239 */
    230 void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userleave)(int id, const char *me, const char *who, const char *room);
    231 
     240        void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userleave) (int id,
     241                const char *me, const char *who, const char *room);
    232242
    233243/*
    … …  
    238248 *      xml     - ?
    239249 */
    240 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_cat_xml)(int id, const char *xml);
    241 
     250        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_cat_xml) (int id,
     251                const char *xml);
    242252
    243253/*
    … …  
    254264 *      fd      - the socket where the connection is coming from (for tracking)
    255265 */
    256 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_join)(int id, const char *me, const char *room, const char *topic, YList *members, int fd);
    257 
     266        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_join) (int id, const char *me,
     267                const char *room, const char *topic, YList *members, int fd);
    258268
    259269/*
    … …  
    266276 *      who  - the user who has joined, Must be freed by the client
    267277 */
    268 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userjoin)(int id, const char *me, const char *room, struct yahoo_chat_member *who);
    269 
     278        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userjoin) (int id,
     279                const char *me, const char *room,
     280                struct yahoo_chat_member *who);
    270281
    271282/*
    … …  
    278289 *      who  - the user who has left (Just the User ID)
    279290 */
    280 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userleave)(int id, const char *me, const char *room, const char *who);
    281 
     291        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userleave) (int id,
     292                const char *me, const char *room, const char *who);
    282293
    283294/*
    … …  
    294305 *      utf8 - whether the message is utf8 encoded or not
    295306 */
    296 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_message)(int id, const char *me, const char *who, const char *room, const char *msg, int msgtype, int utf8);
    297 
     307        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_message) (int id,
     308                const char *me, const char *who, const char *room,
     309                const char *msg, int msgtype, int utf8);
    298310
    299311/*
    … …  
    310322 *      nothing.
    311323 */
    312 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahoologout)(int id, const char *me);
    313 
     324        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahoologout) (int id,
     325                const char *me);
    314326
    315327/*
    … …  
    327339 *      nothing.
    328340 */
    329 void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahooerror)(int id, const char *me);
    330 
     341        void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahooerror) (int id,
     342                const char *me);
    331343
    332344/*
    … …  
    341353 *      utf8 - whether the message is utf8 encoded or not
    342354 */
    343 void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_message)(int id, const char *me, const char *who, const char *room, const char *msg, int utf8);
    344 
     355        void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_message) (int id,
     356                const char *me, const char *who, const char *room,
     357                const char *msg, int utf8);
    345358
    346359/*
    … …  
    381394 *      msg  - any message sent
    382395 */
    383 void YAHOO_CALLBACK_TYPE(ext_yahoo_contact_added)(int id, const char *myid, const char *who, const char *msg);
    384 
     396        void YAHOO_CALLBACK_TYPE(ext_yahoo_contact_added) (int id,
     397                const char *myid, const char *who, const char *msg);
    385398
    386399/*
    … …  
    392405 *      msg  - any message sent
    393406 */
    394 void YAHOO_CALLBACK_TYPE(ext_yahoo_rejected)(int id, const char *who, const char *msg);
    395 
     407        void YAHOO_CALLBACK_TYPE(ext_yahoo_rejected) (int id, const char *who,
     408                const char *msg);
    396409
    397410/*
    … …  
    404417 *      stat - 1 if typing, 0 if stopped typing
    405418 */
    406 void YAHOO_CALLBACK_TYPE(ext_yahoo_typing_notify)(int id, const char *me, const char *who, int stat);
    407 
     419        void YAHOO_CALLBACK_TYPE(ext_yahoo_typing_notify) (int id,
     420                const char *me, const char *who, int stat);
    408421
    409422/*
    … …  
    428441 *      cnt  - mail count - 0 if new mail notification
    429442 */
    430 void YAHOO_CALLBACK_TYPE(ext_yahoo_mail_notify)(int id, const char *from, const char *subj, int cnt);
    431 
     443        void YAHOO_CALLBACK_TYPE(ext_yahoo_mail_notify) (int id,
     444                const char *from, const char *subj, int cnt);
    432445
    433446/*
    … …  
    450463 *      checksum - the checksum of the icon content
    451464 */
    452 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon)(int id, const char *me, const char *who, const char *url, int checksum);
     465        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon) (int id,
     466                const char *me, const char *who, const char *url, int checksum);
    453467
    454468/*
    … …  
    461475 *      checksum - the checksum of the icon content
    462476 */
    463 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_checksum)(int id, const char *me,const char *who, int checksum);
     477        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_checksum) (int id,
     478                const char *me, const char *who, int checksum);
    464479
    465480/*
    … …  
    471486 *      who - the yahoo id of the buddy that requested the buddy icon
    472487 */
    473 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_request)(int id, const char *me, const char *who);
     488        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_request) (int id,
     489                const char *me, const char *who);
    474490
    475491/*
    … …  
    480496 *      url - remote url, the uploaded buddy icon can be fetched from
    481497 */
    482 void YAHOO_CALLBACK_TYPE(ext_yahoo_buddyicon_uploaded)(int id, const char *url);
     498        void YAHOO_CALLBACK_TYPE(ext_yahoo_buddyicon_uploaded) (int id,
     499                const char *url);
    483500
    484501/*
    … …  
    505522 *      a timestamp to stay in sync
    506523 */
    507 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_webcam_image)(int id, const char * who,
    508                 const unsigned char *image, unsigned int image_size, unsigned int real_size,
     524        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_webcam_image) (int id,
     525                const char *who, const unsigned char *image,
     526                unsigned int image_size, unsigned int real_size,
    509527                unsigned int timestamp);
    510 
    511528
    512529/*
    … …  
    518535 *      from - who the invitation is from
    519536 */
    520 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite)(int id, const char *me, const char *from);
    521 
     537        void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite) (int id,
     538                const char *me, const char *from);
    522539
    523540/*
    … …  
    530547 *      accept - 0 (decline), 1 (accept)
    531548 */
    532 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite_reply)(int id, const char *me, const char *from, int accept);
    533 
     549        void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite_reply) (int id,
     550                const char *me, const char *from, int accept);
    534551
    535552/*
    … …  
    545562 *               4 = user does not have webcam online
    546563 */
    547 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_closed)(int id, const char *who, int reason);
    548 
     564        void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_closed) (int id,
     565                const char *who, int reason);
    549566
    550567/*
    … …  
    560577 *                 if you need to use the information, make a copy
    561578 */
    562 void YAHOO_CALLBACK_TYPE(ext_yahoo_got_search_result)(int id, int found, int start, int total, YList *contacts);
    563 
     579        void YAHOO_CALLBACK_TYPE(ext_yahoo_got_search_result) (int id,
     580                int found, int start, int total, YList *contacts);
    564581
    565582/*
    … …  
    572589 *      num  - Which error is this
    573590 */
    574 void YAHOO_CALLBACK_TYPE(ext_yahoo_error)(int id, const char *err, int fatal, int num);
    575 
     591        void YAHOO_CALLBACK_TYPE(ext_yahoo_error) (int id, const char *err,
     592                int fatal, int num);
    576593
    577594/*
    … …  
    583600 *      connect - 0=disconnect 1=connect 2=request
    584601 */
    585 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_viewer)(int id, const char *who, int connect);
    586 
     602        void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_viewer) (int id,
     603                const char *who, int connect);
    587604
    588605/*
    … …  
    593610 *      send - whether to send images or not
    594611 */
    595 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_data_request)(int id, int send);
    596 
     612        void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_data_request) (int id,
     613                int send);
    597614
    598615/*
    … …  
    604621 *      0
    605622 */
    606 int YAHOO_CALLBACK_TYPE(ext_yahoo_log)(const char *fmt, ...);
    607 
     623        int YAHOO_CALLBACK_TYPE(ext_yahoo_log) (const char *fmt, ...);
    608624
    609625/*
    … …  
    620636 * Returns: a tag to be used when removing the handler
    621637 */
    622 int YAHOO_CALLBACK_TYPE(ext_yahoo_add_handler)(int id, int fd, yahoo_input_condition cond, void *data);
    623 
     638        int YAHOO_CALLBACK_TYPE(ext_yahoo_add_handler) (int id, int fd,
     639                yahoo_input_condition cond, void *data);
    624640
    625641/*
    … …  
    630646 *      tag  - the handler tag to remove
    631647 */
    632 void YAHOO_CALLBACK_TYPE(ext_yahoo_remove_handler)(int id, int tag);
    633 
     648        void YAHOO_CALLBACK_TYPE(ext_yahoo_remove_handler) (int id, int tag);
    634649
    635650/*
    … …  
    642657 *      a unix file descriptor to the socket
    643658 */
    644 int YAHOO_CALLBACK_TYPE(ext_yahoo_connect)(const char *host, int port);
    645 
     659        int YAHOO_CALLBACK_TYPE(ext_yahoo_connect) (const char *host, int port);
    646660
    647661/*
    648662 * Name: ext_yahoo_connect_async
    649  *      Connect to a host:port asynchronously.  This function should return
     663 *      Connect to a host:port asynchronously. This function should return
    650664 *      immediately returing a tag used to identify the connection handler,
    651665 *      or a pre-connect error (eg: host name lookup failure).
    … …  
    663677 *      a unix file descriptor to the socket
    664678 */
    665 int YAHOO_CALLBACK_TYPE(ext_yahoo_connect_async)(int id, const char *host, int port,
    666                 yahoo_connect_callback callback, void *callback_data);
     679        int YAHOO_CALLBACK_TYPE(ext_yahoo_connect_async) (int id,
     680                const char *host, int port, yahoo_connect_callback callback,
     681                void *callback_data);
    667682
    668683#ifdef USE_STRUCT_CALLBACKS
    … …  
    673688 * before doing anything else
    674689 */
    675 void yahoo_register_callbacks(struct yahoo_callbacks * tyc);
     690void yahoo_register_callbacks(struct yahoo_callbacks *tyc);
    676691
    677692#undef YAHOO_CALLBACK_TYPE
Note: See TracChangeset for help on using the changeset viewer.