]> granicus.if.org Git - icinga2/commitdiff
Fixed more compilation warnings.
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 10 May 2012 11:46:04 +0000 (13:46 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 10 May 2012 11:49:24 +0000 (13:49 +0200)
22 files changed:
base/application.cpp
base/base.vcxproj
base/i2-base.h
base/socket.cpp
base/tcpclient.cpp
base/tcpserver.cpp
base/thread.cpp
base/thread.h
base/tlsclient.cpp
cJSON/cJSON.vcxproj
components/configfile/configfile.vcxproj
components/configrpc/configrpc.vcxproj
components/demo/demo.vcxproj
components/demo/democomponent.cpp
components/discovery/discovery.vcxproj
icinga-app/icinga-app.vcxproj
icinga/icinga.vcxproj
icinga/icingaapplication.cpp
icinga/jsonrpcendpoint.cpp
jsonrpc/jsonrpc.vcxproj
jsonrpc/jsonrpcclient.cpp
mmatch/mmatch.vcxproj

index 907f9175945b4c517b0bc45a56a75a9395f5e587..358837bee302e45ad3b8cee2539ceab15b522421 100644 (file)
@@ -226,11 +226,15 @@ Component::Ptr Application::LoadComponent(const string& path,
                throw ComponentLoadException("Could not load module");
 
 #ifdef _WIN32
-       pCreateComponent = (CreateComponentFunction)GetProcAddress(hModule,
-           "CreateComponent");
+       pCreateComponent = reinterpret_cast<CreateComponentFunction>(GetProcAddress(hModule,
+           "CreateComponent"));
 #else /* _WIN32 */
-       pCreateComponent = (CreateComponentFunction)lt_dlsym(hModule,
-           "CreateComponent");
+#      ifdef __GNUC__
+       /* suppress compiler warning for void * cast */
+       __extension__
+#      endif
+       pCreateComponent = reinterpret_cast<CreateComponentFunction>(lt_dlsym(hModule,
+           "CreateComponent"));
 #endif /* _WIN32 */
 
        if (pCreateComponent == NULL)
index e94e09843ad0e993f114ff254d7db9ebb8c041cb..3710e309d13d07ed0da2ff90db36d82073525477 100644 (file)
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDLL;I2_BASE_BUILD;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDLL;I2_BASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index 6333c69b2ea7bd32b1485db4d0b2d1259c24bfc6..79422dcc8ea18e7e30b5c3b0d678c97119c2b982 100644 (file)
@@ -24,6 +24,7 @@
 #      define HAVE_CXX11
 #      pragma warning(disable:4251)
 #      define _CRT_SECURE_NO_DEPRECATE
+#      define _CRT_SECURE_NO_WARNINGS
 #else /* _MSC_VER */
 #      include "config.h"
 #endif /* _MSC_VER */
index dfdcb6cad064584389306a0bdadc6f16e7c7e636..6b57a211633821dfa9e018536bc692280326fc84 100644 (file)
@@ -170,10 +170,10 @@ void Socket::HandleSocketError(void)
  *
  * Processes errors that have occured for the socket.
  *
- * @param ea Event arguments for the socket error.
+ * @param - Event arguments for the socket error.
  * @returns 0
  */
-int Socket::ExceptionEventHandler(const EventArgs& ea)
+int Socket::ExceptionEventHandler(const EventArgs&)
 {
        HandleSocketError();
 
index fb8b1ba09d10a00ccaf425657bb4fe480ec0635b..894ae6055ff0b32a906a7c69c89f9463e616adb3 100644 (file)
@@ -146,10 +146,10 @@ FIFO::Ptr TCPClient::GetRecvQueue(void)
  *
  * Processes data that is available for this socket.
  *
- * @param ea Event arguments.
+ * @param - Event arguments.
  * @returns 0
  */
-int TCPClient::ReadableEventHandler(const EventArgs& ea)
+int TCPClient::ReadableEventHandler(const EventArgs&)
 {
        int rc;
 
@@ -183,10 +183,10 @@ int TCPClient::ReadableEventHandler(const EventArgs& ea)
  *
  * Processes data that can be written for this socket.
  *
- * @param ea Event arguments.
+ * @param - Event arguments.
  * @returns 0
  */
-int TCPClient::WritableEventHandler(const EventArgs& ea)
+int TCPClient::WritableEventHandler(const EventArgs&)
 {
        int rc;
 
index 07cf7525f60c919e76fc9ce14c1378c2babfefa8..efa7041f68e9703ecbbcaf38c2d28412db87b193 100644 (file)
@@ -88,10 +88,10 @@ void TCPServer::Listen(void)
  * Accepts a new client and creates a new client object for it
  * using the client factory function.
  *
- * @param ea Event arguments.
+ * @param - Event arguments.
  * @returns 0
  */
-int TCPServer::ReadableEventHandler(const EventArgs& ea)
+int TCPServer::ReadableEventHandler(const EventArgs&)
 {
        int fd;
        sockaddr_storage addr;
index fbf67f45591a60c91ab8cbd41fd6fd817a4c1080..3cf9a10e8de53057a5f846072df2a1b28851a0fe 100644 (file)
@@ -57,13 +57,16 @@ static void *ThreadStartProc(void *param)
  * Constructor for the thread class. Creates a new thread that begins
  * executing immediately.
  */
-Thread::Thread(ThreadProc callback)
+Thread::Thread(ThreadProc callback, void *param)
 {
        threadparam_t *tparam = new threadparam_t();
 
        if (tparam == NULL)
                throw OutOfMemoryException("Out of memory");
 
+       tparam->callback = callback;
+       tparam->param = param;
+
 #ifdef _WIN32
        m_Thread = CreateThread(NULL, 0, ThreadStartProc, tparam, CREATE_SUSPENDED, NULL);
 
index 6f66b6495bcc046999aaa4d608bcf36433d3fb40..34b51b96a777a05131a097f061387e504fe7e1d6 100644 (file)
@@ -40,7 +40,7 @@ private:
 #endif
 
 public:
-       Thread(ThreadProc callback);
+       Thread(ThreadProc callback, void *param);
        ~Thread(void);
 
        void Join(void);
index d5237bb79b757415249b64bc2eebb5fc03f2fdd6..5e3f575196b42dccd1673e0f9cc6ed1e60ffbee7 100644 (file)
@@ -118,10 +118,10 @@ void TLSClient::Start(void)
  *
  * Processes data that is available for this socket.
  *
- * @param ea Event arguments.
+ * @param - Event arguments.
  * @returns 0
  */
-int TLSClient::ReadableEventHandler(const EventArgs& ea)
+int TLSClient::ReadableEventHandler(const EventArgs&)
 {
        int rc;
 
@@ -164,10 +164,10 @@ int TLSClient::ReadableEventHandler(const EventArgs& ea)
  *
  * Processes data that can be written for this socket.
  *
- * @param ea Event arguments.
+ * @param - Event arguments.
  * @returns 0
  */
-int TLSClient::WritableEventHandler(const EventArgs& ea)
+int TLSClient::WritableEventHandler(const EventArgs&)
 {
        int rc;
 
index 0d218cc036efcd46b927b9e751cc53cc776b06f3..3568a5482db479b1fb755858387eb41fd9d558e2 100644 (file)
@@ -48,9 +48,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -59,7 +59,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -67,6 +66,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index d21122a56939236e613f1d50bffe6ef1e1cc6ff8..1f8708527b68a84756291a7bc460364e9f4b978d 100644 (file)
@@ -56,9 +56,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -72,7 +72,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -80,6 +79,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index de2fc326468f13cba2b65502c462888b04ea9d50..f42b96386ddb7dc4625311ded67b57745332ce7a 100644 (file)
@@ -58,9 +58,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONFIGCOMPONENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -70,7 +70,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -78,6 +77,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONFIGCOMPONENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index 87a7a9442a4f4bec9585ab957bd1f60846624f48..db011539a637e5c10684c4f03f26eb3263360732 100644 (file)
@@ -51,9 +51,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index 0e3d73eb1984caa81a4fafb34fe5c47364f79ff7..0ea5fcc5f79ee7bbe334060adc3ba036d7ddc227 100644 (file)
@@ -74,10 +74,10 @@ void DemoComponent::Stop(void)
  *
  * Periodically sends a demo::HelloWorld message.
  *
- * @param tea Event arguments for the timer.
+ * @param - Event arguments for the timer.
  * @returns 0
  */
-int DemoComponent::DemoTimerHandler(const TimerEventArgs& tea)
+int DemoComponent::DemoTimerHandler(const TimerEventArgs&)
 {
        Application::Log("Sending multicast 'hello world' message.");
 
index 2dc5988237b307802602e856440c6c61509f90ff..ff09b4f25740ee8c6d2ef58c3373589193195f89 100644 (file)
@@ -51,9 +51,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DISCOVERY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DISCOVERY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index ea6bb93282548cf96245587921883ab27087b02a..16a24dedff496f67b7c4ab3f2c9567f32b74886d 100644 (file)
@@ -55,9 +55,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I2_ICINGALAUNCHER_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -67,7 +67,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -75,6 +74,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
index 3520d007d67a1f63339ee02ab433fffd0beac026..c58a2675b515bb7435b24495c2c47343ed5be423 100644 (file)
@@ -69,9 +69,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -81,7 +81,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -89,6 +88,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
index ae6770f26c00078cdc98b891b0afdbbdb19999b8..208863d129e56aa31c22a3d7a2317e67b50dc61c 100644 (file)
@@ -167,11 +167,9 @@ int IcingaApplication::NewIcingaConfigHandler(const EventArgs& ea)
        return 0;
 }
 
-int IcingaApplication::DeletedIcingaConfigHandler(const EventArgs& ea)
+int IcingaApplication::DeletedIcingaConfigHandler(const EventArgs&)
 {
        throw Exception("Unsupported operation.");
-
-       return 0;
 }
 
 void IcingaApplication::SetPrivateKeyFile(string privkey)
index db8c2a4394f12ab330dda3868a449e53f7e6c90a..3c3758752955e0331dea2efe65a074a439fdae10 100644 (file)
@@ -108,7 +108,7 @@ int JsonRpcEndpoint::NewMessageHandler(const NewMessageEventArgs& nmea)
        return 0;
 }
 
-int JsonRpcEndpoint::ClientClosedHandler(const EventArgs& ea)
+int JsonRpcEndpoint::ClientClosedHandler(const EventArgs&)
 {
        Application::Log("Lost connection to endpoint: identity=" + GetIdentity());
 
index e595d6d80cd6971c9342092404e47fc4649c650c..1eaa212b975eccd83de76ff2ff4f86cb9203fe92 100644 (file)
@@ -66,9 +66,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I2_JSONRPC_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -82,7 +82,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -90,6 +89,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I2_JSONRPC_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
index 7e82d8091f45d7f5e24d6a99bec45c995e8c4a5e..b83331811aad2f71264c620c9ad12c795eb664c5 100644 (file)
@@ -36,9 +36,9 @@ void JsonRpcClient::SendMessage(const Message& message)
        Netstring::WriteMessageToFIFO(GetSendQueue(), message);
 }
 
-int JsonRpcClient::DataAvailableHandler(const EventArgs& ea)
+int JsonRpcClient::DataAvailableHandler(const EventArgs&)
 {
-       while (true) {
+       for (;;) {
                try {
                        Message message;
 
index 40d9905b577ffc687e386e9bb8d4950825cf983c..632e28d77a49e70f5af5d7e534bd8194692289f0 100644 (file)
@@ -48,9 +48,9 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>