made FileWithDetails::mFsFileId a std::size_t

Author: firewave

lib/analyzerinfo.cpp

@@ -128,7 +128,7 @@ std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& f
     return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fsFileId)
+std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)
 {
     std::ifstream fin(Path::join(buildDir, "files.txt"));
     if (fin.is_open()) {
@@ -146,7 +146,7 @@ std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir
     return Path::join(buildDir, std::move(filename)) + ".analyzerinfo";
 }
 
-bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fsFileId, std::size_t hash, std::list<ErrorMessage> &errors)
+bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors)
 {
     if (buildDir.empty() || sourcefile.empty())
         return true;

lib/analyzerinfo.h

@@ -61,10 +61,10 @@ class CPPCHECKLIB AnalyzerInformation {
 
     /** Close current TU.analyzerinfo file */
     void close();
-    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fsFileId, std::size_t hash, std::list<ErrorMessage> &errors);
+    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors);
     void reportErr(const ErrorMessage &msg);
     void setFileInfo(const std::string &check, const std::string &fileInfo);
-    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fsFileId);
+    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId);
 
     static const char sep = ':';
 
@@ -73,7 +73,7 @@ class CPPCHECKLIB AnalyzerInformation {
         bool parse(const std::string& filesTxtLine);
         std::string afile;
         std::string cfg;
-        int fsFileId = 0;
+        std::size_t fsFileId = 0;
         std::string sourceFile;
     };
 

lib/cppcheck.cpp

@@ -332,7 +332,7 @@ static std::vector<std::string> split(const std::string &str, const std::string
     return ret;
 }
 
-static std::string getDumpFileName(const Settings& settings, const std::string& filename, int fsFileId)
+static std::string getDumpFileName(const Settings& settings, const std::string& filename, std::size_t fsFileId)
 {
     std::string extension = ".dump";
     if (fsFileId > 0)

lib/filesettings.h

@@ -69,12 +69,12 @@ class FileWithDetails
         return mLang;
     }
 
-    int fsFileId() const
+    std::size_t fsFileId() const
     {
         return mFsFileId;
     }
 
-    void setFsFileId(int fsFileId)
+    void setFsFileId(std::size_t fsFileId)
     {
         mFsFileId = fsFileId;
     }
@@ -83,7 +83,7 @@ class FileWithDetails
     std::string mPathSimplified;
     Standards::Language mLang = Standards::Language::None;
     std::size_t mSize;
-    int mFsFileId{0};
+    std::size_t mFsFileId{0};
 };
 
 /** File settings. Multiple configurations for a file is allowed. */

lib/summaries.cpp

@@ -35,7 +35,7 @@
 
 
 
-std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, int fsFileId)
+std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId)
 {
     const SymbolDatabase *symbolDatabase = tokenizer.getSymbolDatabase();
     const Settings &settings = tokenizer.getSettings();

lib/summaries.h

@@ -29,7 +29,7 @@
 class Tokenizer;
 
 namespace Summaries {
-    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, int fsFileId);
+    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId);
     CPPCHECKLIB void loadReturn(const std::string &buildDir, std::set<std::string> &summaryReturn);
 }