diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-01 21:00:38 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-02 18:13:22 +0000 |
commit | f8ee1422db60190aaad63d967584b0ffc52e9fd8 (patch) | |
tree | 76e92fa4796eef5193b4581acc00053823101d26 /src/plugins/scanner | |
parent | 2a88460ace25208b3774ab0e32df3fa9d20452ea (diff) |
Fix uninitialized variables
This fixes most of clang analyzer warnings about uninitialized variables
in ctors
Change-Id: I879c785594307ed3fe7140588338a6b2a1e4db65
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/scanner')
-rw-r--r-- | src/plugins/scanner/cpp/Lexer.h | 14 | ||||
-rw-r--r-- | src/plugins/scanner/cpp/Token.h | 2 | ||||
-rw-r--r-- | src/plugins/scanner/qt/qtscanner.cpp | 20 |
3 files changed, 14 insertions, 22 deletions
diff --git a/src/plugins/scanner/cpp/Lexer.h b/src/plugins/scanner/cpp/Lexer.h index 2b843a14a..1cf829ebb 100644 --- a/src/plugins/scanner/cpp/Lexer.h +++ b/src/plugins/scanner/cpp/Lexer.h @@ -145,17 +145,17 @@ private: unsigned _objCEnabled: 1; }; - const char *_firstChar; - const char *_currentChar; - const char *_lastChar; - const char *_tokenStart; - unsigned char _yychar; - int _state; + const char *_firstChar = nullptr; + const char *_currentChar = nullptr; + const char *_lastChar = nullptr; + const char *_tokenStart = nullptr; + unsigned char _yychar = 0; + int _state = 0; union { unsigned _flags; Flags f; }; - unsigned _currentLine; + unsigned _currentLine = 0; }; } // end of namespace CPlusPlus diff --git a/src/plugins/scanner/cpp/Token.h b/src/plugins/scanner/cpp/Token.h index 286c71a48..846aa5a12 100644 --- a/src/plugins/scanner/cpp/Token.h +++ b/src/plugins/scanner/cpp/Token.h @@ -353,7 +353,7 @@ public: Flags f; }; - unsigned offset; + unsigned offset = 0; union { void *ptr; diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 51faadab3..40d062e1f 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -68,24 +68,16 @@ struct OpaqQrc { #ifdef Q_OS_UNIX - int fd; - int mapl; + int fd = 0; + int mapl = 0; #else - QFile *file; + QFile *file = nullptr; #endif - char *map; - QXmlStreamReader *xml; + char *map = nullptr; + QXmlStreamReader *xml = nullptr; QByteArray current; - OpaqQrc() -#ifdef Q_OS_UNIX - : fd (0), -#else - : file(nullptr), -#endif - map(nullptr), - xml(nullptr) - {} + OpaqQrc() = default; ~OpaqQrc() { |