Merge branch 'submit' of git://github.com/jhol/pion into jhol-submit2

build/pion-boost.inc

@@ -134,25 +134,22 @@ if test "x$enable_tests" == "xno"; then
 	# Display notice if unit tests are disabled
 	AC_MSG_NOTICE([Unit tests are disabled])
 else
-	BOOST_TRY_LIB=unit_test_framework
-	BOOST_TRY_LINK="$BOOST_HOME_DIR/lib/libboost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}.a"
 	# check if static version of lib is available
-	if !(test -r "$BOOST_TRY_LINK"); then
-	    BOOST_TRY_LINK="-lboost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}"
-	    PION_TESTS_CPPFLAGS="-DBOOST_TEST_DYN_LINK"
-	fi
+	BOOST_TRY_LIB=unit_test_framework
+	BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}"
+	PION_TESTS_CPPFLAGS="-DBOOST_TEST_DYN_LINK"
 	LIBS_SAVED="$LIBS"
-	LIBS="$LIBS_SAVED ${BOOST_TRY_LINK}"
+	LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK}"
 	CPPFLAGS_SAVED="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS ${PION_TESTS_CPPFLAGS}"
 	AC_MSG_CHECKING([for boost::test library])
 	AC_TRY_LINK([#include <boost/test/unit_test.hpp>
 		using namespace boost::unit_test;
-		test_suite* init_unit_test_suite( int argc, char* argv[] )
+		test_suite* init_unit_test_suite( int, char** )
 		{ return BOOST_TEST_SUITE("Master test suite"); }],
 		[],
 		[ AC_MSG_RESULT(ok)
-		  BOOST_TEST_LIB="${BOOST_TRY_LINK}"
+		  BOOST_TEST_LIB="-l${BOOST_TRY_LINK}"
 		],
 		[ AC_MSG_RESULT(not found)
 		  AC_MSG_ERROR(Unable to link with the boost::${BOOST_TRY_LIB} library)

build/pion-setup.inc

@@ -30,8 +30,8 @@ case "$build_os" in
 		# Solaris: GCC compiler
 		CPPFLAGS="$CPPFLAGS -pthreads -D_REENTRANT"
 		LDFLAGS="$LDFLAGS -pthreads"
-		PION_OPT_FLAGS="-O2 -ggdb -Wall -Wno-strict-aliasing -DNDEBUG"
-		PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wno-strict-aliasing -fkeep-inline-functions"
+		PION_OPT_FLAGS="-O2 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+		PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
 	fi
 	PION_EXTERNAL_LIBS="-lsocket -lnsl -lposix4"
 	;;
@@ -40,9 +40,9 @@ case "$build_os" in
 	# -pthread is implied (automatically set by compiler)
 	CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 	#LDFLAGS="$LDFLAGS"
-	#PION_OPT_FLAGS="-O3 -ggdb -fomit-frame-pointer -fstrict-aliasing -fno-tree-pre -falign-loops -Wall -Wno-strict-aliasing -DNDEBUG"
-	PION_OPT_FLAGS="-O3 -ggdb -fomit-frame-pointer -fstrict-aliasing -Wall -Wno-strict-aliasing -DNDEBUG"
-	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wno-strict-aliasing -fkeep-inline-functions"
+	#PION_OPT_FLAGS="-O3 -ggdb -fomit-frame-pointer -fstrict-aliasing -fno-tree-pre -falign-loops -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_OPT_FLAGS="-O3 -ggdb -fomit-frame-pointer -fstrict-aliasing -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
 
 	# Check for OSX binary architecture
 	AC_MSG_CHECKING([for OSX binary architectures])
@@ -71,24 +71,32 @@ case "$build_os" in
 	# Cygwin GCC compiler (Windows)
 	CPPFLAGS="$CPPFLAGS -mthreads -D_REENTRANT -DPION_WIN32 -D__USE_W32_SOCKETS"
 	LDFLAGS="$LDFLAGS -mthreads -Wl,-E"
-	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wno-strict-aliasing -DNDEBUG"
-	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wno-strict-aliasing -fkeep-inline-functions"
+	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
+	PION_EXTERNAL_LIBS="-lws2_32 -lmswsock"
+	;;
+*mingw32*)
+	# MingW32 GCC compiler (Windows)
+	CPPFLAGS="$CPPFLAGS -pthread -D_REENTRANT -DPION_WIN32 -D__USE_W32_SOCKETS"
+	LDFLAGS="$LDFLAGS -pthread -Wl,-E"
+	PION_OPT_FLAGS="-O1 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
 	PION_EXTERNAL_LIBS="-lws2_32 -lmswsock"
 	;;
 *freebsd*)
 	# FreeBSD: GCC compiler
 	CPPFLAGS="$CPPFLAGS -pthread -D_REENTRANT"
 	LDFLAGS="$LDFLAGS -pthread -Wl,-E"
-	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wno-strict-aliasing -DNDEBUG"
-	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wno-strict-aliasing -fkeep-inline-functions"
+	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
 	;;
 *)
 	# Other (Linux): GCC compiler
 	CPPFLAGS="$CPPFLAGS -pthread -D_REENTRANT"
 	LDFLAGS="$LDFLAGS -pthread -Wl,-E"
 	LIBS="-lrt -ldl"
-	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wno-strict-aliasing -DNDEBUG"
-	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wno-strict-aliasing -fkeep-inline-functions"
+	PION_OPT_FLAGS="-O2 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -DNDEBUG"
+	PION_DEBUG_FLAGS="-O0 -ggdb -Wall -Wextra -Werror -Wno-strict-aliasing -fkeep-inline-functions"
 	;;
 esac
 

cmake/PionUtils.cmake

@@ -35,12 +35,12 @@ macro(pion_update_compilation_opts)
 
     if(CMAKE_COMPILER_IS_GNUCXX)
         if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -W")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -W")
         endif()
     endif()
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -W")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -W")
     endif()
 
     message("CMAKE_CXX_COMPILER_VERSION = ${CMAKE_CXX_COMPILER_VERSION}")

include/pion/http/auth.hpp

@@ -65,7 +65,7 @@ class PION_API auth :
      * @param name the name of the option to change
      * @param value the value of the option
      */
-    virtual void set_option(const std::string& name, const std::string& value) {
+    virtual void set_option(const std::string& name, const std::string& /* value */) {
         BOOST_THROW_EXCEPTION( error::bad_arg() << error::errinfo_arg_name(name) );
     }
 

include/pion/http/parser.hpp

@@ -441,7 +441,7 @@ class PION_API parser :
 protected:
 
     /// Called after we have finished parsing the HTTP message headers
-    virtual void finished_parsing_headers(const boost::system::error_code& ec) {}
+    virtual void finished_parsing_headers(const boost::system::error_code& /* ec */) {}
 
     /**
      * parses an HTTP message up to the end of the headers using bytes 

include/pion/http/plugin_service.hpp

@@ -51,7 +51,7 @@ class plugin_service :
      * @param name the name of the option to change
      * @param value the value of the option
      */
-    virtual void set_option(const std::string& name, const std::string& value) {
+    virtual void set_option(const std::string& name, const std::string& /* value */) {
         BOOST_THROW_EXCEPTION( error::bad_arg() << error::errinfo_arg_name(name) );
     }
 

include/pion/http/request_writer.hpp

@@ -139,6 +139,8 @@ class request_writer :
     virtual void handle_write(const boost::system::error_code& write_error,
                              std::size_t bytes_written)
     {
+        (void)bytes_written;
+
         logger log_ptr(get_logger());
         if (! write_error) {
             // request sent OK

include/pion/http/response_writer.hpp

@@ -147,6 +147,8 @@ class PION_API response_writer :
     virtual void handle_write(const boost::system::error_code& write_error,
                              std::size_t bytes_written)
     {
+        (void)bytes_written;
+
         logger log_ptr(get_logger());
         if (!write_error) {
             // response sent OK

include/pion/logger.hpp

@@ -206,10 +206,10 @@
     }
 
     #undef PION_HAS_LOG_APPENDER
-    #define PION_LOG_CONFIG_BASIC   {}
+    #define PION_LOG_CONFIG_BASIC   (void)0
     #define PION_LOG_CONFIG(FILE)   {}
     #define PION_GET_LOGGER(NAME)   0
-    #define PION_SHUTDOWN_LOGGER    0
+    #define PION_SHUTDOWN_LOGGER    (void)0
 
     // use LOG to avoid warnings about LOG not being used
     #define PION_LOG_SETLEVEL_DEBUG(LOG)    { if (LOG) {} }

include/pion/process.hpp

@@ -18,7 +18,7 @@
 #include <pion/config.hpp>
 
 // Dump file generation support on Windows
-#ifdef _MSC_VER
+#ifdef PION_WIN32
 #include <windows.h>
 #include <tchar.h>
 #include <DbgHelp.h>
@@ -57,14 +57,14 @@ class PION_API process :
     /// fork process and run as a background daemon
     static void daemonize(void);
 
-#ifdef _MSC_VER
+#ifdef PION_WIN32
 
     class dumpfile_init_exception : public std::exception
     {
     public:
         dumpfile_init_exception(const std::string& cause) : m_cause(cause) {}
 
-        virtual const char* what() const { return m_cause.c_str(); }
+        virtual const char* what() const throw() { return m_cause.c_str(); }
     protected:
         std::string m_cause;
     };
@@ -89,7 +89,7 @@ class PION_API process :
     /// data type for static/global process configuration information
     struct config_type {
         /// constructor just initializes native types
-#ifdef _MSC_VER
+#ifdef PION_WIN32
         config_type() : shutdown_now(false), h_dbghelp(NULL), p_dump_proc(NULL) {}
 #else
         config_type() : shutdown_now(false) {}
@@ -105,7 +105,7 @@ class PION_API process :
         boost::mutex            shutdown_mutex;
 
 // Dump file generation support on Windows
-#ifdef _MSC_VER
+#ifdef PION_WIN32
         /// mini-dump file location
         std::string             dumpfile_dir;
 

include/pion/scheduler.hpp

@@ -201,7 +201,7 @@ class PION_API multi_thread_scheduler :
 {
 public:
 
-    /// constructs a new single_service_scheduler
+    /// constructs a new multi_thread_scheduler
     multi_thread_scheduler(void) {}
 
     /// virtual destructor

include/pion/test/unit_test.hpp

@@ -55,7 +55,7 @@ namespace test {    // begin namespace test
 
         /// wrapper to flush output for xml_log_formatter::log_start
         virtual void log_start(std::ostream& ostr,
-                               boost::unit_test::counter_t test_cases_amount )
+                               boost::unit_test::counter_t /* test_cases_amount */)
         {
             ostr << "<TestLog>" << std::endl;
         }

services/FileService.cpp

@@ -937,7 +937,7 @@ void DiskFileSender::send(void)
 }
 
 void DiskFileSender::handle_write(const boost::system::error_code& write_error,
-                                 std::size_t bytes_written)
+                                 std::size_t /* bytes_written */)
 {
     bool finished_sending = true;
 

src/admin_rights.cpp

@@ -9,7 +9,7 @@
 
 #include <pion/admin_rights.hpp>
 
-#ifndef _MSC_VER
+#ifndef PION_WIN32
     #include <sys/types.h>
     #include <unistd.h>
     #include <sys/types.h>
@@ -31,7 +31,7 @@ boost::mutex            admin_rights::m_mutex;
 
 // admin_rights member functions
 
-#ifdef _MSC_VER
+#ifdef PION_WIN32
 
 admin_rights::admin_rights(bool use_log)
     : m_logger(PION_GET_LOGGER("pion.admin_rights")),
@@ -41,23 +41,23 @@ admin_rights::admin_rights(bool use_log)
 void admin_rights::release(void)
 {}
 
-long admin_rights::run_as_user(const std::string& user_name)
+long admin_rights::run_as_user(const std::string& /* user_name */)
 {
     return -1;
 }
 
-long admin_rights::run_as_group(const std::string& group_name)
+long admin_rights::run_as_group(const std::string& /* group_name */)
 {
     return -1;
 }
 
-long admin_rights::find_system_id(const std::string& name,
-    const std::string& file)
+long admin_rights::find_system_id(const std::string& /* name */,
+    const std::string& /* file */)
 {
     return -1;
 }
 
-#else   // NOT #ifdef _MSC_VER
+#else   // NOT #ifdef PION_WIN32
 
 admin_rights::admin_rights(bool use_log)
     : m_logger(PION_GET_LOGGER("pion.admin_rights")),
@@ -154,7 +154,7 @@ long admin_rights::find_system_id(const std::string& name,
     return system_id;
 }
 
-#endif  // #ifdef _MSC_VER
+#endif  // #ifdef PION_WIN32
 
 }   // end namespace pion
 

src/http_parser.cpp

@@ -1422,7 +1422,7 @@ boost::tribool parser::parse_chunks(http::message::chunk_cache_t& chunks,
 }
 
 boost::tribool parser::consume_content(http::message& http_msg,
-    boost::system::error_code& ec)
+    boost::system::error_code& /* ec */)
 {
     size_t content_bytes_to_read;
     size_t content_bytes_available = bytes_available();

src/plugin.cpp

@@ -53,6 +53,9 @@ void plugin::check_cygwin_path(boost::filesystem::path& final_path,
     if (! final_path.is_complete() && final_path.has_root_directory()) {
         final_path = boost::filesystem::path(std::string(PION_CYGWIN_DIRECTORY) + start_path);
     }
+#else
+    (void)final_path;
+    (void)start_path;
 #endif
 }
 
@@ -372,6 +375,7 @@ void plugin::close_dynamic_library(void *lib_handle)
     // So, please don't call FreeLibrary here unless you've been able to 
     // reproduce and fix the crashing of the unit tests.
 
+    (void)lib_handle;
     //FreeLibrary((HINSTANCE) lib_handle);
 #else
     dlclose(lib_handle);

src/process.cpp

@@ -8,7 +8,7 @@
 //
 
 #include <signal.h>
-#ifndef _MSC_VER
+#ifndef PION_WIN32
     #include <fcntl.h>
     #include <unistd.h>
     #include <sys/stat.h>
@@ -57,7 +57,7 @@ void process::create_config(void)
 
 
 
-#ifdef _MSC_VER
+#ifdef PION_WIN32
 
 BOOL WINAPI console_ctrl_handler(DWORD ctrl_type)
 {
@@ -182,7 +182,7 @@ LONG WINAPI process::unhandled_exception_filter(struct _EXCEPTION_POINTERS *pExc
 
         ExInfo.ThreadId = ::GetCurrentThreadId();
         ExInfo.ExceptionPointers = pExceptionInfo;
-        ExInfo.ClientPointers = NULL;
+        ExInfo.ClientPointers = 0;
 
         // write the dump
         BOOL bOK = cfg.p_dump_proc(GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &ExInfo, NULL, NULL );
@@ -217,9 +217,9 @@ void process::daemonize(void)
     // not supported
 }
 
-#else   // NOT #ifdef _MSC_VER
+#else   // NOT #ifdef PION_WIN32
 
-void handle_signal(int sig)
+void handle_signal(int /* sig */)
 {
     process::shutdown();
 }
@@ -268,6 +268,6 @@ void process::daemonize(void)
     umask(027);
 }
 
-#endif  // #ifdef _MSC_VER
+#endif  // #ifdef PION_WIN32
 
 }   // end namespace pion