From: Piotr S. <ps...@us...> - 2009-09-17 12:05:44
|
Update of /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aim-oscar/libfaim/include Modified Files: aim.h aim_cbtypes.h aim_internal.h faimconfig.h md5.h Log Message: reformatted source code Index: aim.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -40,14 +40,14 @@ #endif /* XXX adjust these based on autoconf-detected platform */ -typedef unsigned char fu8_t; -typedef unsigned short fu16_t; -typedef unsigned int fu32_t; -typedef fu32_t aim_snacid_t; -typedef fu16_t flap_seqnum_t; + typedef unsigned char fu8_t; + typedef unsigned short fu16_t; + typedef unsigned int fu32_t; [...1895 lines suppressed...] -faim_export int aimutil_putstr(char *, const char *, int); -faim_export fu16_t aimutil_iconsum(const fu8_t *buf, int buflen); -faim_export int aim_util_getlocalip(fu8_t *ip); -faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl); -faim_export int aimutil_itemcnt(char *toSearch, char dl); -faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl); - -faim_export int aim_snlen(const char *sn); -faim_export int aim_sncmp(const char *sn1, const char *sn2); + faim_export int aim_snlen(const char *sn); + faim_export int aim_sncmp(const char *sn1, const char *sn2); #include <aim_internal.h> #ifdef __cplusplus } #endif - -#endif /* __AIM_H__ */ +#endif /* __AIM_H__ */ Index: aim_cbtypes.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim_cbtypes.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim_cbtypes.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim_cbtypes.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -21,16 +21,16 @@ #define AIM_CB_FAM_LOK 0x000a #define AIM_CB_FAM_STS 0x000b #define AIM_CB_FAM_TRN 0x000c -#define AIM_CB_FAM_CTN 0x000d /* ChatNav */ -#define AIM_CB_FAM_CHT 0x000e /* Chat */ -#define AIM_CB_FAM_SCH 0x000f /* "New" search */ -#define AIM_CB_FAM_ICO 0x0010 /* Used for uploading buddy icons */ -#define AIM_CB_FAM_SSI 0x0013 /* Server stored information */ +#define AIM_CB_FAM_CTN 0x000d /* ChatNav */ +#define AIM_CB_FAM_CHT 0x000e /* Chat */ +#define AIM_CB_FAM_SCH 0x000f /* "New" search */ +#define AIM_CB_FAM_ICO 0x0010 /* Used for uploading buddy icons */ +#define AIM_CB_FAM_SSI 0x0013 /* Server stored information */ #define AIM_CB_FAM_ICQ 0x0015 #define AIM_CB_FAM_ATH 0x0017 #define AIM_CB_FAM_EML 0x0018 -#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ -#define AIM_CB_FAM_SPECIAL 0xffff /* Internal libfaim use */ +#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ +#define AIM_CB_FAM_SPECIAL 0xffff /* Internal libfaim use */ /* * SNAC Family: Ack. @@ -43,7 +43,7 @@ /* * SNAC Family: General. - */ + */ #define AIM_CB_GEN_ERROR 0x0001 #define AIM_CB_GEN_CLIENTREADY 0x0002 #define AIM_CB_GEN_SERVERREADY 0x0003 @@ -68,7 +68,7 @@ /* * SNAC Family: Location Services. - */ + */ #define AIM_CB_LOC_ERROR 0x0001 #define AIM_CB_LOC_REQRIGHTS 0x0002 #define AIM_CB_LOC_RIGHTSINFO 0x0003 @@ -81,7 +81,7 @@ /* * SNAC Family: Buddy List Management Services. - */ + */ #define AIM_CB_BUD_ERROR 0x0001 #define AIM_CB_BUD_REQRIGHTS 0x0002 #define AIM_CB_BUD_RIGHTSINFO 0x0003 @@ -94,7 +94,7 @@ /* * SNAC Family: Messeging Services. - */ + */ #define AIM_CB_MSG_ERROR 0x0001 #define AIM_CB_MSG_PARAMINFO 0x0005 #define AIM_CB_MSG_INCOMING 0x0007 @@ -107,32 +107,32 @@ /* * SNAC Family: Advertisement Services - */ + */ #define AIM_CB_ADS_ERROR 0x0001 #define AIM_CB_ADS_DEFAULT 0xffff /* * SNAC Family: Invitation Services. - */ + */ #define AIM_CB_INV_ERROR 0x0001 #define AIM_CB_INV_DEFAULT 0xffff /* * SNAC Family: Administrative Services. - */ + */ #define AIM_CB_ADM_ERROR 0x0001 #define AIM_CB_ADM_INFOCHANGE_REPLY 0x0005 #define AIM_CB_ADM_DEFAULT 0xffff /* * SNAC Family: Popup Messages - */ + */ #define AIM_CB_POP_ERROR 0x0001 #define AIM_CB_POP_DEFAULT 0xffff /* * SNAC Family: Misc BOS Services. - */ + */ #define AIM_CB_BOS_ERROR 0x0001 #define AIM_CB_BOS_RIGHTSQUERY 0x0002 #define AIM_CB_BOS_RIGHTS 0x0003 @@ -140,13 +140,13 @@ /* * SNAC Family: User Lookup Services - */ + */ #define AIM_CB_LOK_ERROR 0x0001 #define AIM_CB_LOK_DEFAULT 0xffff /* * SNAC Family: User Status Services - */ + */ #define AIM_CB_STS_ERROR 0x0001 #define AIM_CB_STS_SETREPORTINTERVAL 0x0002 #define AIM_CB_STS_REPORTACK 0x0004 @@ -154,13 +154,13 @@ /* * SNAC Family: Translation Services - */ + */ #define AIM_CB_TRN_ERROR 0x0001 #define AIM_CB_TRN_DEFAULT 0xffff /* * SNAC Family: Chat Navigation Services - */ + */ #define AIM_CB_CTN_ERROR 0x0001 #define AIM_CB_CTN_CREATE 0x0008 #define AIM_CB_CTN_INFO 0x0009 @@ -168,7 +168,7 @@ /* * SNAC Family: Chat Services - */ + */ #define AIM_CB_CHT_ERROR 0x0001 #define AIM_CB_CHT_ROOMINFOUPDATE 0x0002 #define AIM_CB_CHT_USERJOIN 0x0003 @@ -179,14 +179,14 @@ /* * SNAC Family: "New" Search - */ + */ #define AIM_CB_SCH_ERROR 0x0001 #define AIM_CB_SCH_SEARCH 0x0002 #define AIM_CB_SCH_RESULTS 0x0003 /* * SNAC Family: Buddy icons - */ + */ #define AIM_CB_ICO_ERROR 0x0001 #define AIM_CB_ICO_REQUEST 0x0004 #define AIM_CB_ICO_RESPONSE 0x0005 @@ -195,7 +195,7 @@ * SNAC Family: ICQ * * Most of these are actually special. - */ + */ #define AIM_CB_ICQ_ERROR 0x0001 #define AIM_CB_ICQ_OFFLINEMSG 0x00f0 #define AIM_CB_ICQ_OFFLINEMSGCOMPLETE 0x00f1 @@ -269,20 +269,20 @@ #define AIM_CB_OFT_DIRECTIMTYPING 0x0004 #define AIM_CB_OFT_DIRECTIM_ESTABLISHED 0x0005 -#define AIM_CB_OFT_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */ +#define AIM_CB_OFT_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */ #define AIM_CB_OFT_RESUMESOMETHING 0x0106 /* I really don't know */ -#define AIM_CB_OFT_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */ -#define AIM_CB_OFT_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */ -#define AIM_CB_OFT_RESUME 0x0205 /* Resume transferring, sent by whoever paused? */ -#define AIM_CB_OFT_RESUMEACK 0x0207 /* Not really sure */ - -#define AIM_CB_OFT_GETFILE_REQUESTLISTING 0x1108 /* "I have a listing.txt file, do you want it?" */ -#define AIM_CB_OFT_GETFILE_RECEIVELISTING 0x1209 /* "Yes, please send me your listing.txt file" */ -#define AIM_CB_OFT_GETFILE_RECEIVEDLISTING 0x120a /* received corrupt listing.txt file? */ /* I'm just guessing about this one... */ +#define AIM_CB_OFT_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */ +#define AIM_CB_OFT_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */ +#define AIM_CB_OFT_RESUME 0x0205 /* Resume transferring, sent by whoever paused? */ +#define AIM_CB_OFT_RESUMEACK 0x0207 /* Not really sure */ + +#define AIM_CB_OFT_GETFILE_REQUESTLISTING 0x1108 /* "I have a listing.txt file, do you want it?" */ +#define AIM_CB_OFT_GETFILE_RECEIVELISTING 0x1209 /* "Yes, please send me your listing.txt file" */ +#define AIM_CB_OFT_GETFILE_RECEIVEDLISTING 0x120a /* received corrupt listing.txt file? */ /* I'm just guessing about this one... */ #define AIM_CB_OFT_GETFILE_ACKLISTING 0x120b /* "I received the listing.txt file successfully" */ #define AIM_CB_OFT_GETFILE_REQUESTFILE 0x120c /* "Please send me this file" */ -#define AIM_CB_OFT_ESTABLISHED 0xFFFF /* connection to buddy initiated */ +#define AIM_CB_OFT_ESTABLISHED 0xFFFF /* connection to buddy initiated */ /* * SNAC Family: Internal Messages @@ -291,7 +291,7 @@ * these, we can integrated non-SNAC services into * the SNAC-centered libfaim callback structure. * - */ + */ #define AIM_CB_SPECIAL_AUTHSUCCESS 0x0001 #define AIM_CB_SPECIAL_AUTHOTHER 0x0002 #define AIM_CB_SPECIAL_CONNERR 0x0003 Index: aim_internal.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim_internal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim_internal.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim_internal.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -22,18 +22,22 @@ fu16_t toolid; fu16_t toolversion; fu16_t flags; - char name[AIM_MODULENAME_MAXLEN+1]; - int (*snachandler)(aim_session_t *sess, struct aim_module_s *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs); + char name[AIM_MODULENAME_MAXLEN + 1]; + int (*snachandler) (aim_session_t *sess, struct aim_module_s *mod, + aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs); - void (*shutdown)(aim_session_t *sess, struct aim_module_s *mod); + void (*shutdown) (aim_session_t *sess, struct aim_module_s *mod); void *priv; struct aim_module_s *next; } aim_module_t; -faim_internal int aim__registermodule(aim_session_t *sess, int (*modfirst)(aim_session_t *, aim_module_t *)); +faim_internal int aim__registermodule(aim_session_t *sess, + int (*modfirst) (aim_session_t *, aim_module_t *)); faim_internal void aim__shutdownmodules(aim_session_t *sess); -faim_internal aim_module_t *aim__findmodulebygroup(aim_session_t *sess, fu16_t group); -faim_internal aim_module_t *aim__findmodule(aim_session_t *sess, const char *name); +faim_internal aim_module_t *aim__findmodulebygroup(aim_session_t *sess, + fu16_t group); +faim_internal aim_module_t *aim__findmodule(aim_session_t *sess, + const char *name); faim_internal int admin_modfirst(aim_session_t *sess, aim_module_t *mod); faim_internal int buddylist_modfirst(aim_session_t *sess, aim_module_t *mod); @@ -57,10 +61,14 @@ faim_internal int icq_modfirst(aim_session_t *sess, aim_module_t *mod); faim_internal int email_modfirst(aim_session_t *sess, aim_module_t *mod); -faim_internal int aim_genericreq_n(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype); -faim_internal int aim_genericreq_n_snacid(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype); -faim_internal int aim_genericreq_l(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype, fu32_t *); -faim_internal int aim_genericreq_s(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype, fu16_t *); +faim_internal int aim_genericreq_n(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype); +faim_internal int aim_genericreq_n_snacid(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype); +faim_internal int aim_genericreq_l(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype, fu32_t *); +faim_internal int aim_genericreq_s(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype, fu16_t *); #define AIMBS_CURPOSPAIR(x) ((x)->data + (x)->offset), ((x)->len - (x)->offset) @@ -93,22 +101,28 @@ faim_internal aim_conn_t *aim_cloneconn(aim_session_t *sess, aim_conn_t *src); /* ft.c */ -faim_internal int aim_rxdispatch_rendezvous(aim_session_t *sess, aim_frame_t *fr); +faim_internal int aim_rxdispatch_rendezvous(aim_session_t *sess, + aim_frame_t *fr); /* rxhandlers.c */ -faim_internal aim_rxcallback_t aim_callhandler(aim_session_t *sess, aim_conn_t *conn, fu16_t family, fu16_t type); -faim_internal int aim_callhandler_noparam(aim_session_t *sess, aim_conn_t *conn, fu16_t family, fu16_t type, aim_frame_t *ptr); +faim_internal aim_rxcallback_t aim_callhandler(aim_session_t *sess, + aim_conn_t *conn, fu16_t family, fu16_t type); +faim_internal int aim_callhandler_noparam(aim_session_t *sess, aim_conn_t *conn, + fu16_t family, fu16_t type, aim_frame_t *ptr); faim_internal int aim_parse_unknown(aim_session_t *, aim_frame_t *, ...); -faim_internal void aim_clonehandlers(aim_session_t *sess, aim_conn_t *dest, aim_conn_t *src); +faim_internal void aim_clonehandlers(aim_session_t *sess, aim_conn_t *dest, + aim_conn_t *src); /* rxqueue.c */ faim_internal int aim_recv(int fd, void *buf, size_t count); faim_internal int aim_bstream_recv(aim_bstream_t *bs, int fd, size_t count); -faim_internal void aim_rxqueue_cleanbyconn(aim_session_t *sess, aim_conn_t *conn); +faim_internal void aim_rxqueue_cleanbyconn(aim_session_t *sess, + aim_conn_t *conn); faim_internal void aim_frame_destroy(aim_frame_t *); /* txqueue.c */ -faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, fu8_t framing, fu16_t chan, int datalen); +faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, + fu8_t framing, fu16_t chan, int datalen); faim_internal int aim_tx_enqueue(aim_session_t *, aim_frame_t *); faim_internal flap_seqnum_t aim_get_next_txseqnum(aim_conn_t *); faim_internal int aim_tx_sendframe(aim_session_t *sess, aim_frame_t *cur); @@ -132,9 +146,12 @@ /* snac.c */ faim_internal void aim_initsnachash(aim_session_t *sess); faim_internal aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac); -faim_internal aim_snacid_t aim_cachesnac(aim_session_t *sess, const fu16_t family, const fu16_t type, const fu16_t flags, const void *data, const int datalen); +faim_internal aim_snacid_t aim_cachesnac(aim_session_t *sess, + const fu16_t family, const fu16_t type, const fu16_t flags, + const void *data, const int datalen); faim_internal aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id); -faim_internal int aim_putsnac(aim_bstream_t *, fu16_t family, fu16_t type, fu16_t flags, aim_snacid_t id); +faim_internal int aim_putsnac(aim_bstream_t *, fu16_t family, fu16_t type, + fu16_t flags, aim_snacid_t id); /* Stored in ->priv of the service request SNAC for chats. */ struct chatsnacinfo { @@ -168,11 +185,11 @@ fu32_t disconnect; fu32_t current; fu32_t max; - fu8_t unknown[5]; /* only present in versions >= 3 */ + fu8_t unknown[5]; /* only present in versions >= 3 */ struct snacpair *members; struct rateclass *next; }; -#endif /* FAIM_NEED_CONN_INTERNAL */ +#endif /* FAIM_NEED_CONN_INTERNAL */ /* * This is inside every connection. But it is a void * to anything @@ -189,22 +206,28 @@ faim_internal void aim_conn_addgroup(aim_conn_t *conn, fu16_t group); faim_internal int aim_cachecookie(aim_session_t *sess, aim_msgcookie_t *cookie); -faim_internal aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, fu8_t *cookie, int type); +faim_internal aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, + fu8_t *cookie, int type); faim_internal aim_msgcookie_t *aim_mkcookie(fu8_t *, int, void *); -faim_internal aim_msgcookie_t *aim_checkcookie(aim_session_t *, const unsigned char *, const int); +faim_internal aim_msgcookie_t *aim_checkcookie(aim_session_t *, + const unsigned char *, const int); faim_internal int aim_freecookie(aim_session_t *sess, aim_msgcookie_t *cookie); faim_internal int aim_msgcookie_gettype(int reqclass); faim_internal int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie); /* 0x0002 - locate.c */ -faim_internal void aim_locate_requestuserinfo(aim_session_t *sess, const char *sn); -faim_internal fu32_t aim_getcap(aim_session_t *sess, aim_bstream_t *bs, int len); +faim_internal void aim_locate_requestuserinfo(aim_session_t *sess, + const char *sn); +faim_internal fu32_t aim_getcap(aim_session_t *sess, aim_bstream_t *bs, + int len); faim_internal int aim_putcap(aim_bstream_t *bs, fu32_t caps); faim_internal void aim_info_free(aim_userinfo_t *); -faim_internal int aim_info_extract(aim_session_t *sess, aim_bstream_t *bs, aim_userinfo_t *); +faim_internal int aim_info_extract(aim_session_t *sess, aim_bstream_t *bs, + aim_userinfo_t *); faim_internal int aim_putuserinfo(aim_bstream_t *bs, aim_userinfo_t *info); -faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, struct aim_chat_roominfo *outinfo); +faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, + struct aim_chat_roominfo *outinfo); faim_internal void aim_conn_kill_chat(aim_session_t *sess, aim_conn_t *conn); @@ -214,12 +237,13 @@ faim_internal int aim_rates_addparam(aim_session_t *, aim_conn_t *); faim_internal int aim_rates_delparam(aim_session_t *, aim_conn_t *); -faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...); +faim_internal void faimdprintf(aim_session_t *sess, int dlevel, + const char *format, ...); #ifndef FAIM_INTERNAL_INSANE #define printf() printf called inside libfaim #define sprintf() unbounded sprintf used inside libfaim #endif -#endif /* __AIM_INTERNAL_H__ */ -#endif /* FAIM_INTERNAL */ +#endif /* __AIM_INTERNAL_H__ */ +#endif /* FAIM_INTERNAL */ Index: faimconfig.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/faimconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- faimconfig.h 29 Sep 2003 20:37:53 -0000 1.1 +++ faimconfig.h 17 Sep 2009 12:04:57 -0000 1.2 @@ -54,6 +54,4 @@ */ #define WIN32_STATIC -#endif /* __FAIMCONFIG_H__ */ - - +#endif /* __FAIMCONFIG_H__ */ Index: md5.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/md5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- md5.h 29 Sep 2003 20:37:53 -0000 1.1 +++ md5.h 17 Sep 2009 12:04:57 -0000 1.2 @@ -50,44 +50,43 @@ * ARCH_IS_BIG_ENDIAN. */ -typedef unsigned char md5_byte_t; /* 8-bit byte */ -typedef unsigned int md5_word_t; /* 32-bit word */ +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ /* Define the state of the MD5 Algorithm. */ typedef struct md5_state_s { - md5_word_t count[2]; /* message length in bits, lsw first */ - md5_word_t abcd[4]; /* digest buffer */ - md5_byte_t buf[64]; /* accumulate block */ + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ } md5_state_t; #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Initialize the algorithm. */ #ifdef P1 -void md5_init(P1(md5_state_t *pms)); + void md5_init(P1(md5_state_t *pms)); #else -void md5_init(md5_state_t *pms); + void md5_init(md5_state_t *pms); #endif /* Append a string to the message. */ #ifdef P3 -void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes)); + void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, + int nbytes)); #else -void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); + void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); #endif /* Finish the message and return the digest. */ #ifdef P2 -void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); + void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); #else -void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); + void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #endif #ifdef __cplusplus -} /* end extern "C" */ +} /* end extern "C" */ #endif - -#endif /* md5_INCLUDED */ +#endif /* md5_INCLUDED */ |