# HG changeset patch # User Mark Huetsch # Date 1154936340 0 # Node ID 6342ffdeb3ac494d079815b355cdf1b4a186a2ec # Parent 8294485b79db6da1430b647e1aaba50c3d21005f [gaim-migrate @ 16663] Eliminated some warnings. committer: Tailor Script diff -r 8294485b79db -r 6342ffdeb3ac src/protocols/qq/buddy_list.c --- a/src/protocols/qq/buddy_list.c Mon Aug 07 06:17:13 2006 +0000 +++ b/src/protocols/qq/buddy_list.c Mon Aug 07 07:39:00 2006 +0000 @@ -413,7 +413,7 @@ } else { /* a group */ group = qq_group_find_by_internal_group_id(gc, uid); if(group == NULL) { - /* not working + /*XXX not working group = qq_group_create_by_id(gc, uid, 0); qq_send_cmd_group_get_group_info(gc, group); */ diff -r 8294485b79db -r 6342ffdeb3ac src/protocols/qq/group_im.c --- a/src/protocols/qq/group_im.c Mon Aug 07 06:17:13 2006 +0000 +++ b/src/protocols/qq/group_im.c Mon Aug 07 07:39:00 2006 +0000 @@ -45,7 +45,7 @@ guint16 msg_seq; time_t send_time; guint16 msg_len; - guint8 *msg; + gchar *msg; guint8 *font_attr; gint font_attr_len; } qq_recv_group_im; @@ -54,7 +54,7 @@ void qq_send_packet_group_im(GaimConnection *gc, qq_group *group, const gchar *msg) { gint data_len, bytes; - guint8 *raw_data, *cursor; + guint8 *raw_data, *cursor, *send_im_tail; guint16 msg_len; gchar *msg_filtered; @@ -70,11 +70,11 @@ bytes += create_packet_b(raw_data, &cursor, QQ_GROUP_CMD_SEND_MSG); bytes += create_packet_dw(raw_data, &cursor, group->internal_group_id); bytes += create_packet_w(raw_data, &cursor, msg_len + QQ_SEND_IM_AFTER_MSG_LEN); - bytes += create_packet_data(raw_data, &cursor, (gchar *) msg_filtered, msg_len); - guint8 *send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL, + bytes += create_packet_data(raw_data, &cursor, (guint8 *) msg_filtered, msg_len); + send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL, FALSE, FALSE, FALSE, QQ_SEND_IM_AFTER_MSG_LEN); - bytes += create_packet_data(raw_data, &cursor, (gchar *) send_im_tail, QQ_SEND_IM_AFTER_MSG_LEN); + bytes += create_packet_data(raw_data, &cursor, send_im_tail, QQ_SEND_IM_AFTER_MSG_LEN); g_free(send_im_tail); g_free(msg_filtered); @@ -296,8 +296,8 @@ } /* recv an IM from a group chat */ -void qq_process_recv_group_im - (guint8 *data, guint8 **cursor, gint data_len, guint32 internal_group_id, GaimConnection *gc, guint16 im_type) +void qq_process_recv_group_im(guint8 *data, guint8 **cursor, gint data_len, + guint32 internal_group_id, GaimConnection *gc, guint16 im_type) { gchar *msg_with_gaim_smiley, *msg_utf8_encoded, *im_src_name; guint16 unknown; @@ -362,7 +362,7 @@ skip_len = 0; *cursor += skip_len; - im_group->msg = g_strdup(*cursor); + im_group->msg = g_strdup((gchar *) *cursor); *cursor += strlen(im_group->msg) + 1; /* there might not be any font_attr, check it */ im_group->font_attr_len = im_group->msg_len - strlen(im_group->msg) - 1 - skip_len; diff -r 8294485b79db -r 6342ffdeb3ac src/protocols/qq/group_join.c --- a/src/protocols/qq/group_join.c Mon Aug 07 06:17:13 2006 +0000 +++ b/src/protocols/qq/group_join.c Mon Aug 07 07:39:00 2006 +0000 @@ -154,7 +154,7 @@ bytes += create_packet_b(raw_data, &cursor, opt); bytes += create_packet_dw(raw_data, &cursor, uid); bytes += create_packet_b(raw_data, &cursor, strlen(reason_qq)); - bytes += create_packet_data(raw_data, &cursor, reason_qq, strlen(reason_qq)); + bytes += create_packet_data(raw_data, &cursor, (guint8 *) reason_qq, strlen(reason_qq)); if (bytes != data_len) gaim_debug(GAIM_DEBUG_ERROR, "QQ", @@ -335,7 +335,6 @@ } } -/*****************************************************************************/ void qq_group_exit(GaimConnection *gc, GHashTable *data) { gchar *internal_group_id_ptr; diff -r 8294485b79db -r 6342ffdeb3ac src/protocols/qq/group_opt.c --- a/src/protocols/qq/group_opt.c Mon Aug 07 06:17:13 2006 +0000 +++ b/src/protocols/qq/group_opt.c Mon Aug 07 07:39:00 2006 +0000 @@ -37,6 +37,7 @@ #include "qq.h" #include "utils.h" +/* TODO: can't we use qsort here? */ /* This implement quick sort algorithm (low->high) */ static void _quick_sort(gint *numbers, gint left, gint right) { @@ -228,7 +229,6 @@ gaim_notify_info(gc, _("QQ Qun Operation"), _("You have successfully modify Qun member"), NULL); } -/*****************************************************************************/ void qq_group_modify_info(GaimConnection *gc, qq_group *group) { gint data_len, data_written; @@ -262,15 +262,15 @@ data_written += create_packet_w(data, &cursor, group->group_category); data_written += create_packet_b(data, &cursor, strlen(group_name)); - data_written += create_packet_data(data, &cursor, group_name, strlen(group_name)); + data_written += create_packet_data(data, &cursor, (guint8 *) group_name, strlen(group_name)); data_written += create_packet_w(data, &cursor, 0x0000); data_written += create_packet_b(data, &cursor, strlen(notice)); - data_written += create_packet_data(data, &cursor, notice, strlen(notice)); + data_written += create_packet_data(data, &cursor, (guint8 *) notice, strlen(notice)); data_written += create_packet_b(data, &cursor, strlen(group_desc)); - data_written += create_packet_data(data, &cursor, group_desc, strlen(group_desc)); + data_written += create_packet_data(data, &cursor, (guint8 *) group_desc, strlen(group_desc)); if (data_written != data_len) gaim_debug(GAIM_DEBUG_ERROR, "QQ", @@ -326,7 +326,7 @@ data_written += create_packet_w(data, &cursor, 0x0003); /* 007 */ data_written += create_packet_b(data, &cursor, strlen(name)); - data_written += create_packet_data(data, &cursor, (gchar *) name, strlen(name)); + data_written += create_packet_data(data, &cursor, (guint8 *) name, strlen(name)); data_written += create_packet_w(data, &cursor, 0x0000); data_written += create_packet_b(data, &cursor, 0x00); /* no group notice */ data_written += create_packet_b(data, &cursor, 0x00); /* no group desc */