[Scummvm-cvs-logs] scummvm master -> ca5804a253c0e654ec6d6210aea9ee2574aad367
sev-
sev at scummvm.org
Fri Sep 27 11:29:55 CEST 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e11da51202 COMMON: Make Coverity 6.6.1 happier
8053989dd1 SWORD25: Remove explictit #includes
ca5804a253 DEVTOOLS: Make Coverity happy.
Commit: e11da512025be5c00390d4822e8d70c1d5fc5749
https://github.com/scummvm/scummvm/commit/e11da512025be5c00390d4822e8d70c1d5fc5749
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-27T01:06:22-07:00
Commit Message:
COMMON: Make Coverity 6.6.1 happier
Apparently their tools do not include __has_feature clang extension.
I've submitted the bugreport to them but in the meantime let's have this
define in the system.
Changed paths:
common/scummsys.h
diff --git a/common/scummsys.h b/common/scummsys.h
index 3e9d5ef..b15a76e 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -23,6 +23,10 @@
#ifndef COMMON_SCUMMSYS_H
#define COMMON_SCUMMSYS_H
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
// This is a convenience macro to test whether the compiler used is a GCC
// version, which is at least major.minor.
#define GCC_ATLEAST(major, minor) (defined(__GNUC__) && (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
Commit: 8053989dd13acc15ad911bf2511311f5cfa206ba
https://github.com/scummvm/scummvm/commit/8053989dd13acc15ad911bf2511311f5cfa206ba
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-27T01:07:25-07:00
Commit Message:
SWORD25: Remove explictit #includes
Makes Coverity happier.
Changed paths:
engines/sword25/util/lua/lcode.cpp
engines/sword25/util/lua/ldebug.cpp
engines/sword25/util/lua/lfunc.cpp
engines/sword25/util/lua/lgc.cpp
engines/sword25/util/lua/llimits.h
engines/sword25/util/lua/lmem.cpp
engines/sword25/util/lua/lopcodes.cpp
engines/sword25/util/lua/lparser.cpp
engines/sword25/util/lua/lstate.cpp
engines/sword25/util/lua/lstring.cpp
engines/sword25/util/lua/lstrlib.cpp
engines/sword25/util/lua/ltablib.cpp
diff --git a/engines/sword25/util/lua/lcode.cpp b/engines/sword25/util/lua/lcode.cpp
index ead780d..93188b3 100644
--- a/engines/sword25/util/lua/lcode.cpp
+++ b/engines/sword25/util/lua/lcode.cpp
@@ -5,8 +5,6 @@
*/
-#include <stdlib.h>
-
#define lcode_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/ldebug.cpp b/engines/sword25/util/lua/ldebug.cpp
index e89ae9c..396c5df 100644
--- a/engines/sword25/util/lua/ldebug.cpp
+++ b/engines/sword25/util/lua/ldebug.cpp
@@ -5,11 +5,6 @@
*/
-#include <stdarg.h>
-#include <stddef.h>
-#include <string.h>
-
-
#define ldebug_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lfunc.cpp b/engines/sword25/util/lua/lfunc.cpp
index f8fa19e..95e616c 100644
--- a/engines/sword25/util/lua/lfunc.cpp
+++ b/engines/sword25/util/lua/lfunc.cpp
@@ -5,8 +5,6 @@
*/
-#include <stddef.h>
-
#define lfunc_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lgc.cpp b/engines/sword25/util/lua/lgc.cpp
index 54f7b54..53f5122 100644
--- a/engines/sword25/util/lua/lgc.cpp
+++ b/engines/sword25/util/lua/lgc.cpp
@@ -4,8 +4,6 @@
** See Copyright Notice in lua.h
*/
-#include <string.h>
-
#define lgc_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/llimits.h b/engines/sword25/util/lua/llimits.h
index 0925231..ce6dbc9 100644
--- a/engines/sword25/util/lua/llimits.h
+++ b/engines/sword25/util/lua/llimits.h
@@ -8,9 +8,6 @@
#define llimits_h
-#include <limits.h>
-#include <stddef.h>
-
#include "lua.h"
diff --git a/engines/sword25/util/lua/lmem.cpp b/engines/sword25/util/lua/lmem.cpp
index 004a467..8cd2203 100644
--- a/engines/sword25/util/lua/lmem.cpp
+++ b/engines/sword25/util/lua/lmem.cpp
@@ -5,8 +5,6 @@
*/
-#include <stddef.h>
-
#define lmem_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lopcodes.cpp b/engines/sword25/util/lua/lopcodes.cpp
index 255b202..9d76862 100644
--- a/engines/sword25/util/lua/lopcodes.cpp
+++ b/engines/sword25/util/lua/lopcodes.cpp
@@ -8,6 +8,7 @@
#define LUA_CORE
+#include "lua.h"
#include "lopcodes.h"
diff --git a/engines/sword25/util/lua/lparser.cpp b/engines/sword25/util/lua/lparser.cpp
index 03ea333..0c88992 100644
--- a/engines/sword25/util/lua/lparser.cpp
+++ b/engines/sword25/util/lua/lparser.cpp
@@ -5,8 +5,6 @@
*/
-#include <string.h>
-
#define lparser_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lstate.cpp b/engines/sword25/util/lua/lstate.cpp
index 26bed7b..c0ea29d 100644
--- a/engines/sword25/util/lua/lstate.cpp
+++ b/engines/sword25/util/lua/lstate.cpp
@@ -5,8 +5,6 @@
*/
-#include <stddef.h>
-
#define lstate_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lstring.cpp b/engines/sword25/util/lua/lstring.cpp
index 046b87e..5cfc725 100644
--- a/engines/sword25/util/lua/lstring.cpp
+++ b/engines/sword25/util/lua/lstring.cpp
@@ -5,8 +5,6 @@
*/
-#include <string.h>
-
#define lstring_c
#define LUA_CORE
diff --git a/engines/sword25/util/lua/lstrlib.cpp b/engines/sword25/util/lua/lstrlib.cpp
index ed68a2f..5da45e1 100644
--- a/engines/sword25/util/lua/lstrlib.cpp
+++ b/engines/sword25/util/lua/lstrlib.cpp
@@ -7,12 +7,6 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_ctype_h
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#define lstrlib_c
#define LUA_LIB
diff --git a/engines/sword25/util/lua/ltablib.cpp b/engines/sword25/util/lua/ltablib.cpp
index 93be9e6..064c33c 100644
--- a/engines/sword25/util/lua/ltablib.cpp
+++ b/engines/sword25/util/lua/ltablib.cpp
@@ -5,8 +5,6 @@
*/
-#include <stddef.h>
-
#define ltablib_c
#define LUA_LIB
Commit: ca5804a253c0e654ec6d6210aea9ee2574aad367
https://github.com/scummvm/scummvm/commit/ca5804a253c0e654ec6d6210aea9ee2574aad367
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-27T02:28:25-07:00
Commit Message:
DEVTOOLS: Make Coverity happy.
This is mainly due to unhandled clang __has_featrure() buit-in.
I do not like this hack, but Coverity proved to be a very good tool for us.
Changed paths:
devtools/convbdf.cpp
devtools/create_mortdat/create_mortdat.cpp
devtools/create_neverhood/create_neverhood.cpp
devtools/create_project/create_project.h
devtools/create_translations/create_translations.cpp
devtools/create_translations/create_translations.h
diff --git a/devtools/convbdf.cpp b/devtools/convbdf.cpp
index c8b1fb7..69728eb 100644
--- a/devtools/convbdf.cpp
+++ b/devtools/convbdf.cpp
@@ -20,6 +20,10 @@
*
*/
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
#include <fstream>
#include <string>
#include <stdio.h>
diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp
index 5a491ee..0065407 100644
--- a/devtools/create_mortdat/create_mortdat.cpp
+++ b/devtools/create_mortdat/create_mortdat.cpp
@@ -33,10 +33,6 @@
#undef main
#endif // main
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "common/endian.h"
#include "create_mortdat.h"
#include "enginetext.h"
diff --git a/devtools/create_neverhood/create_neverhood.cpp b/devtools/create_neverhood/create_neverhood.cpp
index 446ee5e..a37ff99 100644
--- a/devtools/create_neverhood/create_neverhood.cpp
+++ b/devtools/create_neverhood/create_neverhood.cpp
@@ -30,8 +30,8 @@
#undef main
#endif // main
-#include <vector>
#include "create_neverhood.h"
+#include <vector>
#include "md5.h"
#include "tables.h"
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 5325bf6..2f27cc2 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -23,6 +23,10 @@
#ifndef TOOLS_CREATE_PROJECT_H
#define TOOLS_CREATE_PROJECT_H
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
#include <map>
#include <list>
#include <string>
diff --git a/devtools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp
index a153632..a8b04a7 100644
--- a/devtools/create_translations/create_translations.cpp
+++ b/devtools/create_translations/create_translations.cpp
@@ -22,6 +22,8 @@
* The generated files is used by ScummVM to propose translation of its GUI.
*/
+#include "create_translations.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,7 +36,6 @@
#undef main
#endif // main
-#include "create_translations.h"
#include "po_parser.h"
#include "cp_parser.h"
diff --git a/devtools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h
index 9ccbd39..1df01e6 100644
--- a/devtools/create_translations/create_translations.h
+++ b/devtools/create_translations/create_translations.h
@@ -28,4 +28,8 @@ typedef unsigned short uint16;
typedef unsigned int uint32;
typedef signed short int16;
+#ifndef __has_feature // Optional of course.
+ #define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
#endif /* CREATE_TRANSLATIONS_H */
More information about the Scummvm-git-logs
mailing list