1.1 --- a/libpurple/protocols/gg/Makefile.am
1.2 +++ b/libpurple/protocols/gg/Makefile.am
1.3 @@ -1,4 +1,5 @@
1.4 -V=0
1.5 +#V=0
1.6 +#GADU_EXTRA_WARNINGS = -Wall -Wextra -Werror
1.7
1.8 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
1.9
1.10 @@ -117,7 +118,7 @@
1.11 endif
1.12
1.13 AM_CPPFLAGS = \
1.14 - -Wall -Wextra -Werror \
1.15 + $(GADU_EXTRA_WARNINGS) \
1.16 -I$(top_srcdir)/libpurple \
1.17 -I$(top_builddir)/libpurple \
1.18 $(INTGG_CFLAGS) \
2.1 --- a/libpurple/protocols/gg/account.c
2.2 +++ b/libpurple/protocols/gg/account.c
2.3 @@ -197,9 +197,8 @@
2.4 PurpleRequestField *field, *field_password;
2.5 ggp_account_register_data *register_data = _register_data;
2.6
2.7 - purple_debug_info("gg", "ggp_account_register_dialog(%x, %x, %x)\n",
2.8 - (unsigned int)gc, (unsigned int)token,
2.9 - (unsigned int)_register_data);
2.10 + purple_debug_info("gg", "ggp_account_register_dialog(%p, %p, %p)\n",
2.11 + gc, token, _register_data);
2.12 if (!token)
2.13 {
2.14 ggp_account_register_completed(register_data, FALSE);
2.15 @@ -269,8 +268,8 @@
2.16 static void ggp_account_register_dialog_cancel(
2.17 ggp_account_register_data *register_data, PurpleRequestFields *fields)
2.18 {
2.19 - purple_debug_info("gg", "ggp_account_register_dialog_cancel(%x, %x)\n",
2.20 - (unsigned int)register_data, (unsigned int)fields);
2.21 + purple_debug_info("gg", "ggp_account_register_dialog_cancel(%p, %p)\n",
2.22 + register_data, fields);
2.23
2.24 ggp_account_register_completed(register_data, FALSE);
2.25 }
2.26 @@ -280,8 +279,8 @@
2.27 {
2.28 struct gg_http *h;
2.29
2.30 - purple_debug_misc("gg", "ggp_account_register_dialog_ok(%x, %x)\n",
2.31 - (unsigned int)register_data, (unsigned int)fields);
2.32 + purple_debug_misc("gg", "ggp_account_register_dialog_ok(%p, %p)\n",
2.33 + register_data, fields);
2.34
2.35 g_free(register_data->email);
2.36 g_free(register_data->password);
3.1 --- a/libpurple/protocols/gg/avatar.c
3.2 +++ b/libpurple/protocols/gg/avatar.c
3.3 @@ -360,7 +360,7 @@
3.4 "Host: avatars.nowe.gg\r\n"
3.5 "Authorization: %s\r\n"
3.6 "From: avatars to avatars\r\n"
3.7 - "Content-Length: %u\r\n"
3.8 + "Content-Length: %zu\r\n"
3.9 "Content-Type: application/x-www-form-urlencoded\r\n"
3.10 "\r\n%s",
3.11 token, strlen(request_data), request_data);
4.1 --- a/libpurple/protocols/gg/image.c
4.2 +++ b/libpurple/protocols/gg/image.c
4.3 @@ -151,7 +151,7 @@
4.4 image_crc = gg_crc32(0, image_data, image_size);
4.5
4.6 purple_debug_info("gg", "ggp_image_prepare_to_send: image prepared "
4.7 - "[id=%d, crc=%u, size=%d, filename=%s]\n",
4.8 + "[id=%d, crc=%u, size=%zu, filename=%s]\n",
4.9 id, image_crc, image_size, image_filename);
4.10
4.11 pending_image = g_new(ggp_image_pending_image, 1);
5.1 --- a/libpurple/protocols/gg/libgadu-events.c
5.2 +++ b/libpurple/protocols/gg/libgadu-events.c
5.3 @@ -38,7 +38,7 @@
5.4 int user_idx;
5.5 gboolean is_update;
5.6
5.7 - purple_debug_info("gg", "GG_EVENT_USER_DATA [type=%d, user_count=%d]\n",
5.8 + purple_debug_info("gg", "GG_EVENT_USER_DATA [type=%d, user_count=%zu]\n",
5.9 data->type, data->user_count);
5.10
5.11 /*
6.1 --- a/libpurple/protocols/gg/libgaduw.c
6.2 +++ b/libpurple/protocols/gg/libgaduw.c
6.3 @@ -53,8 +53,8 @@
6.4 gpointer user_data, gboolean show_processing)
6.5 {
6.6 ggp_libgaduw_http_req *req;
6.7 - purple_debug_misc("gg", "ggp_libgaduw_http_watch(h=%x, "
6.8 - "show_processing=%d)\n", (unsigned int)h, show_processing);
6.9 + purple_debug_misc("gg", "ggp_libgaduw_http_watch(h=%p, "
6.10 + "show_processing=%d)\n", h, show_processing);
6.11
6.12 req = g_new(ggp_libgaduw_http_req, 1);
6.13 req->user_data = user_data;
6.14 @@ -126,9 +126,8 @@
6.15 static void ggp_libgaduw_http_finish(ggp_libgaduw_http_req *req,
6.16 gboolean success)
6.17 {
6.18 - purple_debug_misc("gg", "ggp_libgaduw_http_finish(h=%x, processing=%x):"
6.19 - " success=%d\n", (unsigned int)req->h,
6.20 - (unsigned int)req->processing, success);
6.21 + purple_debug_misc("gg", "ggp_libgaduw_http_finish(h=%p, processing=%p):"
6.22 + " success=%d\n", req->h, req->processing, success);
6.23 if (req->processing)
6.24 {
6.25 ggp_purplew_request_processing_done(req->processing);
7.1 --- a/libpurple/protocols/gg/oauth/oauth-purple.c
7.2 +++ b/libpurple/protocols/gg/oauth/oauth-purple.c
7.3 @@ -168,7 +168,7 @@
7.4 request = g_strdup_printf(
7.5 "POST /authorize HTTP/1.1\r\n"
7.6 "Host: login.gadu-gadu.pl\r\n"
7.7 - "Content-Length: %d\r\n"
7.8 + "Content-Length: %zu\r\n"
7.9 "Content-Type: application/x-www-form-urlencoded\r\n"
7.10 "\r\n%s",
7.11 strlen(request_data), request_data);
8.1 --- a/libpurple/protocols/gg/pubdir-prpl.c
8.2 +++ b/libpurple/protocols/gg/pubdir-prpl.c
8.3 @@ -68,11 +68,11 @@
8.4
8.5 static void ggp_pubdir_get_info_prpl_got(PurpleConnection *gc,
8.6 int records_count, const ggp_pubdir_record *records, int next_offset,
8.7 - void *_uin);
8.8 + void *_uin_p);
8.9
8.10 static void ggp_pubdir_request_buddy_alias_got(PurpleConnection *gc,
8.11 int records_count, const ggp_pubdir_record *records, int next_offset,
8.12 - void *_uin);
8.13 + void *user_data);
8.14
8.15 // Searching for buddies.
8.16
8.17 @@ -359,21 +359,26 @@
8.18 void ggp_pubdir_get_info_prpl(PurpleConnection *gc, const char *name)
8.19 {
8.20 uin_t uin = ggp_str_to_uin(name);
8.21 + uin_t *uin_p = g_new0(uin_t, 1);
8.22 +
8.23 + *uin_p = uin;
8.24
8.25 purple_debug_info("gg", "ggp_pubdir_get_info_prpl: %u\n", uin);
8.26
8.27 - ggp_pubdir_get_info(gc, uin, ggp_pubdir_get_info_prpl_got, (void*)uin);
8.28 + ggp_pubdir_get_info(gc, uin, ggp_pubdir_get_info_prpl_got, uin_p);
8.29 }
8.30
8.31 static void ggp_pubdir_get_info_prpl_got(PurpleConnection *gc,
8.32 int records_count, const ggp_pubdir_record *records, int next_offset,
8.33 - void *_uin)
8.34 + void *_uin_p)
8.35 {
8.36 - uin_t uin = (uin_t)_uin;
8.37 + uin_t uin = *((uin_t*)_uin_p);
8.38 PurpleNotifyUserInfo *info = purple_notify_user_info_new();
8.39 const ggp_pubdir_record *record = &records[0];
8.40 PurpleBuddy *buddy;
8.41
8.42 + g_free(_uin_p);
8.43 +
8.44 if (records_count < 1)
8.45 {
8.46 purple_debug_error("gg", "ggp_pubdir_get_info_prpl_got: "
8.47 @@ -450,23 +455,23 @@
8.48
8.49 purple_debug_info("gg", "ggp_pubdir_request_buddy_alias: %u\n", uin);
8.50
8.51 - ggp_pubdir_get_info(gc, uin, ggp_pubdir_request_buddy_alias_got, (void*)uin);
8.52 + ggp_pubdir_get_info(gc, uin, ggp_pubdir_request_buddy_alias_got, NULL);
8.53 }
8.54
8.55 static void ggp_pubdir_request_buddy_alias_got(PurpleConnection *gc,
8.56 int records_count, const ggp_pubdir_record *records, int next_offset,
8.57 - void *_uin)
8.58 + void *user_data)
8.59 {
8.60 - uin_t uin = (uin_t)_uin;
8.61 + uin_t uin;
8.62 const gchar *alias;
8.63
8.64 if (records_count < 0)
8.65 {
8.66 purple_debug_error("gg", "ggp_pubdir_request_buddy_alias_got: "
8.67 - "couldn't get info for %u\n", uin);
8.68 + "couldn't get info for user\n");
8.69 return;
8.70 }
8.71 - g_assert(uin == records[0].uin);
8.72 + uin = records[0].uin;
8.73
8.74 alias = records[0].label;
8.75 if (!alias)
8.76 @@ -967,7 +972,7 @@
8.77 "PUT /users/%u.xml HTTP/1.1\r\n"
8.78 "Host: api.gadu-gadu.pl\r\n"
8.79 "%s\r\n"
8.80 - "Content-Length: %d\r\n"
8.81 + "Content-Length: %zu\r\n"
8.82 "Content-Type: application/x-www-form-urlencoded\r\n"
8.83 "\r\n%s",
8.84 uin, token, strlen(request_data), request_data);
9.1 --- a/libpurple/protocols/gg/resolver-purple.c
9.2 +++ b/libpurple/protocols/gg/resolver-purple.c
9.3 @@ -72,8 +72,8 @@
9.4 int ipv4_count, all_count, write_size;
9.5 struct in_addr *addresses;
9.6
9.7 - purple_debug_misc("gg", "ggp_resolver_purple_cb(%x, %x, \"%s\")\n",
9.8 - (unsigned int)hosts, (unsigned int)cbdata, error_message);
9.9 + purple_debug_misc("gg", "ggp_resolver_purple_cb(%p, %p, \"%s\")\n",
9.10 + hosts, cbdata, error_message);
9.11
9.12 if (error_message)
9.13 {
9.14 @@ -137,8 +137,8 @@
9.15 const char *hostname)
9.16 {
9.17 ggp_resolver_purple_data *data;
9.18 - purple_debug_misc("gg", "ggp_resolver_purple_start(%x, %x, \"%s\")\n",
9.19 - (unsigned int)fd, (unsigned int)private_data, hostname);
9.20 + purple_debug_misc("gg", "ggp_resolver_purple_start(%p, %p, \"%s\")\n",
9.21 + fd, private_data, hostname);
9.22
9.23 data = malloc(sizeof(ggp_resolver_purple_data));
9.24 *private_data = (void*)data;
9.25 @@ -176,8 +176,8 @@
9.26 ggp_resolver_purple_data *data =
9.27 (ggp_resolver_purple_data*)(*private_data);
9.28
9.29 - purple_debug_misc("gg", "ggp_resolver_purple_cleanup(%x, %d)\n",
9.30 - (unsigned int)private_data, force);
9.31 + purple_debug_misc("gg", "ggp_resolver_purple_cleanup(%p, %d)\n",
9.32 + private_data, force);
9.33
9.34 if (!data)
9.35 return;