Enable more warnings and fix them.

Matti Virkkunen
1 parent 39d87b5c
Showing 6 changed files with 15 additions and 3 deletions
libpurple/Makefile
libpurple/httpclient.cpp
libpurple/httpclient.hpp
libpurple/pluginmain.cpp
libpurple/purpleline.cpp
libpurple/purpleline_chats.cpp
@@ -12,7 +12,7 @@ else
 endif
  
 CXX ?= g++
-CXXFLAGS = -g -Wall -shared -fPIC \
+CXXFLAGS = -g -Wall -Wextra -Werror -pedantic -shared -fPIC \
 	-DHAVE_INTTYPES_H -DHAVE_CONFIG_H -DPURPLE_PLUGINS \
 	`pkg-config --cflags purple` `libgcrypt-config --cflags` `gpg-error-config --cflags` \
 	$(THRIFT_CXXFLAGS)
@@ -140,6 +140,8 @@ void HTTPClient::complete(HTTPClient::Request *req,
 void HTTPClient::purple_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
     const gchar *url_text, gsize len, const gchar *error_message)
 {
+    (void)url_data;
+
     Request *req = (Request *)user_data;
  
     req->client->complete(req, url_text, len, error_message);
@@ -15,7 +15,7 @@ enum class HTTPFlag {
  
 inline constexpr HTTPFlag operator|(HTTPFlag a, HTTPFlag b) {
     return (HTTPFlag)((int)a | (int)b);
-};
+}
  
 inline constexpr bool operator&(HTTPFlag a, HTTPFlag b) {
     return ((int)a & (int)b) != 0;
@@ -68,10 +68,14 @@ static void init_prpl_info(PurplePluginProtocolInfo &amp;i) {
 }
  
 static void line_plugin_destroy(PurplePlugin *plugin) {
+    (void)plugin;
+
     purple_debug_info("line", "shutting down\n");
 }
  
 static void line_plugin_init(PurplePlugin *plugin) {
+    (void)plugin;
+
     init_info(info);
     init_prpl_info(prpl_info);
  
@@ -79,5 +83,5 @@ static void line_plugin_init(PurplePlugin *plugin) {
 }
  
 extern "C" {
-    PURPLE_INIT_PLUGIN(line, line_plugin_init, info);
+    PURPLE_INIT_PLUGIN(line, line_plugin_init, info)
 }
@@ -131,6 +131,8 @@ char *PurpleLine::status_text(PurpleBuddy *buddy) {
 }
  
 void PurpleLine::tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean full) {
+    (void)full;
+
     purple_notify_user_info_add_pair_plaintext(user_info,
         "Name", purple_buddy_get_alias(buddy));
  
@@ -427,6 +429,8 @@ void PurpleLine::push_recent_message(std::string id) {
 }
  
 int PurpleLine::send_im(const char *who, const char *message, PurpleMessageFlags flags) {
+    (void)flags;
+
     return send_message(who, message);
 }
  
@@ -280,6 +280,8 @@ void PurpleLine::chat_leave(int id) {
 }
  
 int PurpleLine::chat_send(int id, const char *message, PurpleMessageFlags flags) {
+    (void)flags;
+
     PurpleConversation *conv = purple_find_chat(conn, id);
     if (!conv) {
         purple_debug_warning("line", "Tried to send to a nonexistent chat.\n");