diff libgaim/protocols/oscar/oscar.h @ 15085:f3573d941d66

[gaim-migrate @ 17871] Minor cleanup. Mostly make some functions void instead of int where the return value was always 0 and wasn't used committer: Tailor Script <[e-mail]>

--- a/libgaim/protocols/oscar/oscar.h	Sat Dec 02 03:12:57 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.h	Sat Dec 02 08:03:45 2006 +0000
@@ -63,7 +63,6 @@
 typedef struct _IcbmArgsCh2        IcbmArgsCh2;
 
 typedef guint32 aim_snacid_t;
-typedef guint16 flap_seqnum_t;
 
 #include "snactypes.h"
 
@@ -355,7 +354,7 @@
 struct _FlapFrame
 {
 	guint8 channel;
-	flap_seqnum_t seqnum;
+	guint16 seqnum;
 	ByteStream data;        /* payload stream */
 };
 
@@ -382,7 +381,7 @@
 
 	guint16 type;
 	guint16 subtype;
-	flap_seqnum_t seqnum;
+	guint16 seqnum; /**< The sequence number of most recent outgoing packet. */
 	guint32 status;
 	GSList *groups;
 	struct rateclass *rates;
@@ -585,16 +584,10 @@
 void flap_connection_send_keepalive(OscarData *od, FlapConnection *conn);
 FlapFrame *flap_frame_new(OscarData *od, guint16 channel, int datalen);
 
-
 OscarData *oscar_data_new(void);
 void oscar_data_destroy(OscarData *);
 
-/* 0x0001 - family_oservice.c */
-int aim_srv_setstatusmsg(OscarData *od, const char *msg);
-int aim_srv_setidle(OscarData *od, guint32 idletime);
-
 /* misc.c */
-
 #define AIM_VISIBILITYCHANGE_PERMITADD    0x05
 #define AIM_VISIBILITYCHANGE_PERMITREMOVE 0x06
 #define AIM_VISIBILITYCHANGE_DENYADD      0x07
@@ -605,14 +598,28 @@
 
 #define AIM_WARN_ANON                     0x01
 
-int aim_nop(OscarData *, FlapConnection *);
-int aim_bos_changevisibility(OscarData *, FlapConnection *, int, const char *);
-int aim_bos_setgroupperm(OscarData *, FlapConnection *, guint32 mask);
-int aim_bos_setprivacyflags(OscarData *, FlapConnection *, guint32);
-void aim_reqpersonalinfo(OscarData *, FlapConnection *);
-int aim_reqservice(OscarData *, guint16);
-void aim_bos_reqrights(OscarData *, FlapConnection *);
-int aim_setextstatus(OscarData *od, guint32 status);
+
+
+/* 0x0001 - family_oservice.c */
+/* 0x0004 */ void aim_srv_requestnew(OscarData *od, guint16 serviceid);
+/* 0x0006 */ void aim_srv_reqrates(OscarData *od, FlapConnection *conn);
+/* 0x0008 */ void aim_srv_rates_addparam(OscarData *od, FlapConnection *conn);
+/* 0x0009 */ void aim_srv_rates_delparam(OscarData *od, FlapConnection *conn);
+/* 0x000c */ void aim_srv_sendpauseack(OscarData *od, FlapConnection *conn);
+/* 0x000e */ void aim_srv_reqpersonalinfo(OscarData *od, FlapConnection *conn);
+/* 0x0011 */ void aim_srv_setidle(OscarData *od, guint32 idletime);
+/* 0x0014 */ void aim_srv_setprivacyflags(OscarData *od, FlapConnection *conn, guint32);
+/* 0x0016 */ void aim_srv_nop(OscarData *od, FlapConnection *conn);
+/* 0x0017 */ void aim_srv_setversions(OscarData *od, FlapConnection *conn);
+/* 0x001e */ int aim_srv_setstatusmsg(OscarData *od, const char *msg);
+/* 0x001e */ int aim_srv_setextstatus(OscarData *od, guint32 status);
+
+
+void aim_bos_reqrights(OscarData *od, FlapConnection *conn);
+int aim_bos_changevisibility(OscarData *od, FlapConnection *conn, int, const char *);
+void aim_bos_setgroupperm(OscarData *od, FlapConnection *conn, guint32 mask);
+
+
 
 #define AIM_CLIENTTYPE_UNKNOWN  0x0000
 #define AIM_CLIENTTYPE_MC       0x0001
@@ -625,7 +632,7 @@
 #define AIM_RATE_CODE_WARNING    0x0002
 #define AIM_RATE_CODE_LIMIT      0x0003
 #define AIM_RATE_CODE_CLEARLIMIT 0x0004
-int aim_ads_requestads(OscarData *od, FlapConnection *conn);
+void aim_ads_requestads(OscarData *od, FlapConnection *conn);
 
 
 
@@ -1292,7 +1299,7 @@
 /* 0x0017 - family_auth.c */
 void aim_sendcookie(OscarData *, FlapConnection *, const guint16 length, const guint8 *);
 int aim_admin_changepasswd(OscarData *, FlapConnection *, const char *newpw, const char *curpw);
-int aim_admin_reqconfirm(OscarData *od, FlapConnection *conn);
+void aim_admin_reqconfirm(OscarData *od, FlapConnection *conn);
 int aim_admin_getinfo(OscarData *od, FlapConnection *conn, guint16 info);
 int aim_admin_setemail(OscarData *od, FlapConnection *conn, const char *newemail);
 int aim_admin_setnick(OscarData *od, FlapConnection *conn, const char *newnick);
@@ -1489,10 +1496,10 @@
 int icq_modfirst(OscarData *od, aim_module_t *mod);
 int email_modfirst(OscarData *od, aim_module_t *mod);
 
-int aim_genericreq_n(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype);
-void aim_genericreq_n_snacid(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype);
-int aim_genericreq_l(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *);
-int aim_genericreq_s(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *);
+void aim_genericreq_n(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype);
+void aim_genericreq_n_snacid(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype);
+void aim_genericreq_l(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *);
+void aim_genericreq_s(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *);
 
 /* bstream.c */
 int byte_stream_init(ByteStream *bs, guint8 *data, int len);
@@ -1582,17 +1589,6 @@
 
 void flap_connection_destroy_chat(OscarData *od, FlapConnection *conn);
 
-/* These are all handled internally now. */
-void aim_setversions(OscarData *od, FlapConnection *conn);
-void aim_reqrates(OscarData *, FlapConnection *);
-void aim_rates_addparam(OscarData *, FlapConnection *);
-void aim_rates_delparam(OscarData *, FlapConnection *);
-void aim_sendpauseack(OscarData *od, FlapConnection *conn);
-
-
-
-
-
 #ifdef __cplusplus
 }
 #endif