From 2afcf9dd3e866ca5a2fa20080ebf8ff50f3252a9 Mon Sep 17 00:00:00 2001
From: Daniel Wendt <daniel.wendt@linux.com>
Date: Tue, 13 Mar 2018 11:25:16 +0100
Subject: [PATCH] Enable "unused result" warning for MSVC

After researching the Internet, the annotation should be used in
declaration and implementation. After own tests with the MSVC 2012
compiler it is sufficient to use the annotation only in the
declaration to get a compiler warning, as with the GCC compiler.
So the annotation is not necessary in the C implementation.

Bug:https://bugs.freedesktop.org/show_bug.cgi?id=105460
---
 cmake/CMakeLists.txt  | 3 +++
 dbus/dbus-internals.h | 5 +++--
 dbus/dbus-macros.h    | 9 ++++++---
 dbus/dbus-sysdeps.h   | 4 +++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 6349adb..ce088f5 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -218,6 +218,9 @@ if(MSVC)
     # 4114 same type qualifier used more than once
     # 4133 'type' : incompatible types - from 'type1' to 'type2'
     set(WARNINGS_ERRORS "4002 4003 4013 4028 4031 4047 4114 4133")
+    if(MSVC_VERSION GREATER 1600 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze")
+    endif()
 else()
     set(WARNINGS "sign-compare")
     set(WARNINGS_DISABLED "")
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 57a67d0..ae9ab62 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -366,7 +366,8 @@ typedef enum
   _DBUS_N_GLOBAL_LOCKS
 } DBusGlobalLock;
 
-dbus_bool_t _dbus_lock   (DBusGlobalLock lock) _DBUS_GNUC_WARN_UNUSED_RESULT;
+_DBUS_WARN_UNUSED_RESULT
+dbus_bool_t _dbus_lock   (DBusGlobalLock lock);
 void        _dbus_unlock (DBusGlobalLock lock);
 
 #define _DBUS_LOCK_NAME(name)           _DBUS_LOCK_##name
@@ -399,7 +400,7 @@ union DBusGUID
   char as_bytes[DBUS_UUID_LENGTH_BYTES];                /**< guid as 16 single-byte values */
 };
 
-DBUS_PRIVATE_EXPORT _DBUS_GNUC_WARN_UNUSED_RESULT
+DBUS_PRIVATE_EXPORT _DBUS_WARN_UNUSED_RESULT
 dbus_bool_t _dbus_generate_uuid  (DBusGUID         *uuid,
                                   DBusError        *error);
 DBUS_PRIVATE_EXPORT
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index 2c8956e..5f41bd2 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -92,10 +92,13 @@
 #define DBUS_ALLOC_SIZE2(x,y)
 #endif
 
-#if    (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define _DBUS_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+/* MSVC requires to specify this warning in the declaration */
+#if     defined(_MSC_VER) && (_MSC_VER >= 1700)
+#define _DBUS_WARN_UNUSED_RESULT _Must_inspect_result_
+#elif    (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#define _DBUS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
 #else
-#define _DBUS_GNUC_WARN_UNUSED_RESULT
+#define _DBUS_WARN_UNUSED_RESULT
 #endif
 
 /** @def _DBUS_GNUC_PRINTF
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index b3c73b6..093f448 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -135,6 +135,7 @@ typedef struct { SOCKET sock; } DBusSocket;
 static inline SOCKET
 _dbus_socket_printable (DBusSocket s) { return s.sock; }
 
+_DBUS_WARN_UNUSED_RESULT
 static inline dbus_bool_t
 _dbus_socket_is_valid (DBusSocket s) { return s.sock != INVALID_SOCKET; }
 
@@ -153,6 +154,7 @@ typedef struct { int fd; } DBusSocket;
 static inline int
 _dbus_socket_printable (DBusSocket s) { return s.fd; }
 
+_DBUS_WARN_UNUSED_RESULT
 static inline dbus_bool_t
 _dbus_socket_is_valid (DBusSocket s) { return s.fd >= 0; }
 
@@ -462,7 +464,7 @@ const char* _dbus_get_tmpdir      (void);
 /**
  * Random numbers 
  */
-_DBUS_GNUC_WARN_UNUSED_RESULT
+_DBUS_WARN_UNUSED_RESULT
 dbus_bool_t _dbus_generate_random_bytes_buffer (char       *buffer,
                                                 int         n_bytes,
                                                 DBusError  *error);
-- 
2.7.0.windows.1