diff options
author | Eion Robb <eion@robbmob.com> | 2015-08-22 01:05:19 +0300 |
---|---|---|
committer | Eion Robb <eion@robbmob.com> | 2015-08-22 01:05:19 +0300 |
commit | 08cbc2181c1f0a7b88def7d4942e148cc14f0392 (patch) | |
tree | c191244e64df854d9f5c7264ccdf53653fc96d7e | |
parent | 60721d4c6a13bc590aff6d29c2231229f9418f66 (diff) | |
parent | 218f7a4eb9b6dc072a9ac9debce0c2f4c13bfaab (diff) |
Merge pull request #334 from DanNixon/fix_compiler_warnings
Skypeweb: Fix compiler warnings
-rw-r--r-- | skypeweb/skypeweb_connection.c | 2 | ||||
-rw-r--r-- | skypeweb/skypeweb_contacts.c | 1 | ||||
-rw-r--r-- | skypeweb/skypeweb_login.c | 4 | ||||
-rw-r--r-- | skypeweb/skypeweb_messages.c | 9 |
4 files changed, 15 insertions, 1 deletions
diff --git a/skypeweb/skypeweb_connection.c b/skypeweb/skypeweb_connection.c index 27853ff..15eba11 100644 --- a/skypeweb/skypeweb_connection.c +++ b/skypeweb/skypeweb_connection.c @@ -377,6 +377,7 @@ static void skypeweb_post_or_get_connect_cb(gpointer data, gint source, /* TODO: Check the return value of write() */ len = write(skypewebcon->fd, skypewebcon->request->str, skypewebcon->request->len); + (void) len; skypewebcon->input_watcher = purple_input_add(skypewebcon->fd, PURPLE_INPUT_READ, skypeweb_post_or_get_readdata_cb, skypewebcon); @@ -395,6 +396,7 @@ static void skypeweb_post_or_get_ssl_connect_cb(gpointer data, /* TODO: Check the return value of write() */ len = purple_ssl_write(skypewebcon->ssl_conn, skypewebcon->request->str, skypewebcon->request->len); + (void) len; purple_ssl_input_add(skypewebcon->ssl_conn, skypeweb_post_or_get_ssl_readdata_cb, skypewebcon); } diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c index 40c733e..d3a0636 100644 --- a/skypeweb/skypeweb_contacts.c +++ b/skypeweb/skypeweb_contacts.c @@ -199,6 +199,7 @@ skypeweb_got_vm_download_info(SkypeWebAccount *sa, JsonNode *node, gpointer user assetId = json_object_get_string_member(obj, "assetId");
fileSize = json_object_get_int_member(file, "fileSize");
url = json_object_get_string_member(file, "url");
+ (void) url;
filename = g_strconcat(assetId, ".mp4", NULL);
diff --git a/skypeweb/skypeweb_login.c b/skypeweb/skypeweb_login.c index 3641695..c923b79 100644 --- a/skypeweb/skypeweb_login.c +++ b/skypeweb/skypeweb_login.c @@ -64,6 +64,7 @@ skypeweb_login_got_pie(PurpleUtilFetchUrlData *url_data, gpointer user_data, con const gchar *login_url = "https://" SKYPEWEB_LOGIN_HOST;// "/login?client_id=578134&redirect_uri=https%3A%2F%2Fweb.skype.com";
GString *postdata;
gchar *request;
+ struct timeval tv;
struct timezone tz;
guint tzhours, tzminutes;
@@ -72,7 +73,8 @@ skypeweb_login_got_pie(PurpleUtilFetchUrlData *url_data, gpointer user_data, con return;
}
- gettimeofday(NULL, &tz);
+ gettimeofday(&tv, &tz);
+ (void) tv;
tzminutes = tz.tz_minuteswest;
if (tzminutes < 0) tzminutes = -tzminutes;
tzhours = tzminutes / 60;
diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c index e08b6f7..2eda403 100644 --- a/skypeweb/skypeweb_messages.c +++ b/skypeweb/skypeweb_messages.c @@ -158,6 +158,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) #if !PURPLE_VERSION_CHECK(3, 0, 0)
cbflags = purple_conv_chat_user_get_flags(chatconv, from);
+ (void) cb;
#else
cb = purple_chat_conversation_find_user(chatconv, from);
cbflags = purple_chat_user_get_flags(cb);
@@ -194,6 +195,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) // Hard reset cbflags even if user changed settings while someone typing message.
#if !PURPLE_VERSION_CHECK(3, 0, 0)
cbflags = purple_conv_chat_user_get_flags(chatconv, from);
+ (void) cb;
#else
cb = purple_chat_conversation_find_user(chatconv, from);
cbflags = purple_chat_user_get_flags(cb);
@@ -208,6 +210,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) #endif
//TODO if (skypeeditedid && *skypeeditedid) { ... }
+ (void) skypeeditedid;
if (content && *content) {
if (g_str_equal(messagetype, "Text")) {
@@ -278,6 +281,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) }
#if !PURPLE_VERSION_CHECK(3, 0, 0)
purple_conv_chat_user_set_flags(chatconv, &user[2], cbflags);
+ (void) cb;
#else
cb = purple_chat_conversation_find_user(chatconv, &user[2]);
purple_chat_user_set_flags(cb, cbflags);
@@ -381,6 +385,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) conv = PURPLE_CONVERSATION(imconv);
//skypeweb_download_video_message(sa, sid, conv); //TODO
+ (void) sid;
purple_serv_got_im(sa->pc, from, content, PURPLE_MESSAGE_RECV | PURPLE_MESSAGE_SYSTEM, composetimestamp);
}
purple_xmlnode_free(blob);
@@ -393,6 +398,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) if (g_str_equal(sa->username, from)) {
incoming = FALSE;
+ (void) incoming;
from = convbuddyname;
}
if (partlisttype && from != NULL) {
@@ -475,11 +481,14 @@ static void process_conversation_resource(SkypeWebAccount *sa, JsonObject *resource)
{
const gchar *id = json_object_get_string_member(resource, "id");
+ (void) id;
+
JsonObject *threadProperties;
if (json_object_has_member(resource, "threadProperties")) {
threadProperties = json_object_get_object_member(resource, "threadProperties");
}
+ (void) threadProperties;
}
static void
|