Merge pull request #5658 from gartung/clangSA-squelch-checker-warnings

Static Analyzer -- squelch static analyzer warnings for StaticAnalyzer package
cms-sw · Oct 3, 2014 · aa34db5 · aa34db5
2 parents ac478c7 + 04cf35f
commit aa34db5
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Utilities/StaticAnalyzers/src/CmsSupport.cpp b/Utilities/StaticAnalyzers/src/CmsSupport.cpp
@@ -27,12 +27,11 @@ using namespace clang;
 using namespace llvm;
 bool support::isCmsLocalFile(const char* file)
 {
-  static char* LocalDir=0;
-  static int DirLen=-1;
+  static const char* LocalDir= std::getenv("LOCALRT");
+  [[cms::thread_safe]] static int DirLen=-1;
   if (DirLen==-1)
   {
     DirLen=0;
-    LocalDir = getenv ("LOCALRT");
     if (LocalDir!=NULL) DirLen=strlen(LocalDir);
   }
   if ((DirLen==0) || (strncmp(file,LocalDir,DirLen)!=0) || (strncmp(&file[DirLen],"/src/",5)!=0)) return false;
@@ -122,7 +121,7 @@ bool support::isSafeClassName(const std::string &cname) {
 }
 
 bool support::isDataClass(const std::string & name) {
-	static std::string iname("");
+	[[cms::thread_safe]] static std::string iname("");
 	if ( iname == "") {
 		clang::FileSystemOptions FSO;
 		clang::FileManager FM(FSO);
@@ -147,7 +146,7 @@ bool support::isDataClass(const std::string & name) {
 			iname = fname2;
 	}
 
-	static scaling_bloom_t * blmflt = new_scaling_bloom_from_file( CAPACITY, ERROR_RATE, iname.c_str() );
+	[[cms::thread_safe]] static scaling_bloom_t * blmflt = new_scaling_bloom_from_file( CAPACITY, ERROR_RATE, iname.c_str() );
 
 	if ( scaling_bloom_check( blmflt, name.c_str(), name.length() ) == 1 ) return true;