From 39a798b72283294a470a8af8c25d8400a4a9c75d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 7 May 2011 07:14:48 +0000 Subject: The type and length of the TLV are only bytes, so fix the function declarations and definitions. --- libpurple/protocols/msn/tlv.c | 36 ++++++++++++++++++------------------ libpurple/protocols/msn/tlv.h | 38 +++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 37 deletions(-) (limited to 'libpurple') diff --git a/libpurple/protocols/msn/tlv.c b/libpurple/protocols/msn/tlv.c index 5f29aa96dc..0b06147b09 100644 --- a/libpurple/protocols/msn/tlv.c +++ b/libpurple/protocols/msn/tlv.c @@ -169,7 +169,7 @@ msn_tlvlist_size(GSList *list) } int -msn_tlvlist_add_raw(GSList **list, const guint16 type, const guint16 length, const char *value) +msn_tlvlist_add_raw(GSList **list, const guint8 type, const guint8 length, const char *value) { msn_tlv_t *tlv; @@ -186,7 +186,7 @@ msn_tlvlist_add_raw(GSList **list, const guint16 type, const guint16 length, con } int -msn_tlvlist_add_8(GSList **list, const guint16 type, const guint8 value) +msn_tlvlist_add_8(GSList **list, const guint8 type, const guint8 value) { char v8[1]; @@ -196,7 +196,7 @@ msn_tlvlist_add_8(GSList **list, const guint16 type, const guint8 value) } int -msn_tlvlist_add_16(GSList **list, const guint16 type, const guint16 value) +msn_tlvlist_add_16(GSList **list, const guint8 type, const guint16 value) { char v16[2]; @@ -206,7 +206,7 @@ msn_tlvlist_add_16(GSList **list, const guint16 type, const guint16 value) } int -msn_tlvlist_add_32(GSList **list, const guint16 type, const guint32 value) +msn_tlvlist_add_32(GSList **list, const guint8 type, const guint32 value) { char v32[4]; @@ -216,19 +216,19 @@ msn_tlvlist_add_32(GSList **list, const guint16 type, const guint32 value) } int -msn_tlvlist_add_str(GSList **list, const guint16 type, const char *value) +msn_tlvlist_add_str(GSList **list, const guint8 type, const char *value) { return msn_tlvlist_add_raw(list, type, strlen(value), value); } int -msn_tlvlist_add_empty(GSList **list, const guint16 type) +msn_tlvlist_add_empty(GSList **list, const guint8 type) { return msn_tlvlist_add_raw(list, type, 0, NULL); } int -msn_tlvlist_replace_raw(GSList **list, const guint16 type, const guint16 length, const char *value) +msn_tlvlist_replace_raw(GSList **list, const guint8 type, const guint8 length, const char *value) { GSList *cur; msn_tlv_t *tlv; @@ -257,19 +257,19 @@ msn_tlvlist_replace_raw(GSList **list, const guint16 type, const guint16 length, } int -msn_tlvlist_replace_str(GSList **list, const guint16 type, const char *str) +msn_tlvlist_replace_str(GSList **list, const guint8 type, const char *str) { return msn_tlvlist_replace_raw(list, type, strlen(str), str); } int -msn_tlvlist_replace_empty(GSList **list, const guint16 type) +msn_tlvlist_replace_empty(GSList **list, const guint8 type) { return msn_tlvlist_replace_raw(list, type, 0, NULL); } int -msn_tlvlist_replace_8(GSList **list, const guint16 type, const guint8 value) +msn_tlvlist_replace_8(GSList **list, const guint8 type, const guint8 value) { char v8[1]; @@ -279,7 +279,7 @@ msn_tlvlist_replace_8(GSList **list, const guint16 type, const guint8 value) } int -msn_tlvlist_replace_32(GSList **list, const guint16 type, const guint32 value) +msn_tlvlist_replace_32(GSList **list, const guint8 type, const guint32 value) { char v32[4]; @@ -289,7 +289,7 @@ msn_tlvlist_replace_32(GSList **list, const guint16 type, const guint32 value) } void -msn_tlvlist_remove(GSList **list, const guint16 type) +msn_tlvlist_remove(GSList **list, const guint8 type) { GSList *cur, *next; msn_tlv_t *tlv; @@ -356,7 +356,7 @@ msn_tlvlist_write(GSList *list, size_t *out_len) } msn_tlv_t * -msn_tlv_gettlv(GSList *list, const guint16 type, const int nth) +msn_tlv_gettlv(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; int i; @@ -373,7 +373,7 @@ msn_tlv_gettlv(GSList *list, const guint16 type, const int nth) } int -msn_tlv_getlength(GSList *list, const guint16 type, const int nth) +msn_tlv_getlength(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; @@ -397,7 +397,7 @@ msn_tlv_getvalue_as_string(msn_tlv_t *tlv) } char * -msn_tlv_getstr(GSList *list, const guint16 type, const int nth) +msn_tlv_getstr(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; @@ -409,7 +409,7 @@ msn_tlv_getstr(GSList *list, const guint16 type, const int nth) } guint8 -msn_tlv_get8(GSList *list, const guint16 type, const int nth) +msn_tlv_get8(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; @@ -421,7 +421,7 @@ msn_tlv_get8(GSList *list, const guint16 type, const int nth) } guint16 -msn_tlv_get16(GSList *list, const guint16 type, const int nth) +msn_tlv_get16(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; @@ -433,7 +433,7 @@ msn_tlv_get16(GSList *list, const guint16 type, const int nth) } guint32 -msn_tlv_get32(GSList *list, const guint16 type, const int nth) +msn_tlv_get32(GSList *list, const guint8 type, const int nth) { msn_tlv_t *tlv; diff --git a/libpurple/protocols/msn/tlv.h b/libpurple/protocols/msn/tlv.h index 2c4ade2856..55763a732d 100644 --- a/libpurple/protocols/msn/tlv.h +++ b/libpurple/protocols/msn/tlv.h @@ -38,12 +38,12 @@ typedef struct msn_tlv_s /* TLV handling functions */ char *msn_tlv_getvalue_as_string(msn_tlv_t *tlv); -msn_tlv_t *msn_tlv_gettlv(GSList *list, const guint16 type, const int nth); -int msn_tlv_getlength(GSList *list, const guint16 type, const int nth); -char *msn_tlv_getstr(GSList *list, const guint16 type, const int nth); -guint8 msn_tlv_get8(GSList *list, const guint16 type, const int nth); -guint16 msn_tlv_get16(GSList *list, const guint16 type, const int nth); -guint32 msn_tlv_get32(GSList *list, const guint16 type, const int nth); +msn_tlv_t *msn_tlv_gettlv(GSList *list, const guint8 type, const int nth); +int msn_tlv_getlength(GSList *list, const guint8 type, const int nth); +char *msn_tlv_getstr(GSList *list, const guint8 type, const int nth); +guint8 msn_tlv_get8(GSList *list, const guint8 type, const int nth); +guint16 msn_tlv_get16(GSList *list, const guint8 type, const int nth); +guint32 msn_tlv_get32(GSList *list, const guint8 type, const int nth); /* TLV list handling functions */ GSList *msn_tlvlist_read(const char *bs, size_t bs_len); @@ -55,21 +55,21 @@ gboolean msn_tlvlist_equal(GSList *one, GSList *two); char *msn_tlvlist_write(GSList *list, size_t *out_len); void msn_tlvlist_free(GSList *list); -int msn_tlvlist_add_raw(GSList **list, const guint16 type, const guint16 length, const char *value); -int msn_tlvlist_add_empty(GSList **list, const guint16 type); -int msn_tlvlist_add_8(GSList **list, const guint16 type, const guint8 value); -int msn_tlvlist_add_16(GSList **list, const guint16 type, const guint16 value); -int msn_tlvlist_add_32(GSList **list, const guint16 type, const guint32 value); -int msn_tlvlist_add_str(GSList **list, const guint16 type, const char *value); +int msn_tlvlist_add_raw(GSList **list, const guint8 type, const guint8 length, const char *value); +int msn_tlvlist_add_empty(GSList **list, const guint8 type); +int msn_tlvlist_add_8(GSList **list, const guint8 type, const guint8 value); +int msn_tlvlist_add_16(GSList **list, const guint8 type, const guint16 value); +int msn_tlvlist_add_32(GSList **list, const guint8 type, const guint32 value); +int msn_tlvlist_add_str(GSList **list, const guint8 type, const char *value); -int msn_tlvlist_replace_raw(GSList **list, const guint16 type, const guint16 lenth, const char *value); -int msn_tlvlist_replace_str(GSList **list, const guint16 type, const char *str); -int msn_tlvlist_replace_empty(GSList **list, const guint16 type); -int msn_tlvlist_replace_8(GSList **list, const guint16 type, const guint8 value); -int msn_tlvlist_replace_16(GSList **list, const guint16 type, const guint16 value); -int msn_tlvlist_replace_32(GSList **list, const guint16 type, const guint32 value); +int msn_tlvlist_replace_raw(GSList **list, const guint8 type, const guint8 lenth, const char *value); +int msn_tlvlist_replace_str(GSList **list, const guint8 type, const char *str); +int msn_tlvlist_replace_empty(GSList **list, const guint8 type); +int msn_tlvlist_replace_8(GSList **list, const guint8 type, const guint8 value); +int msn_tlvlist_replace_16(GSList **list, const guint8 type, const guint16 value); +int msn_tlvlist_replace_32(GSList **list, const guint8 type, const guint32 value); -void msn_tlvlist_remove(GSList **list, const guint16 type); +void msn_tlvlist_remove(GSList **list, const guint8 type); #endif /* MSN_TLV_H */ -- cgit v1.2.1