Merge pull request XRPLF#273 from nbougalis/static-analysis

Cleanups from static analysis
HowardHinnant · Sep 6, 2014 · db8ca52 · db8ca52
2 parents b7b031f + 9f8aa09
commit db8ca52
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/include/rocksdb/cache.h b/include/rocksdb/cache.h
@@ -127,9 +127,6 @@ class Cache {
   void LRU_Append(Handle* e);
   void Unref(Handle* e);
 
-  struct Rep;
-  Rep* rep_;
-
   // No copying allowed
   Cache(const Cache&);
   void operator=(const Cache&);

diff --git a/port/stack_trace.cc b/port/stack_trace.cc
@@ -33,7 +33,7 @@ const char* GetExecutableName() {
 
   char link[1024];
   snprintf(link, sizeof(link), "/proc/%d/exe", getpid());
-  auto read = readlink(link, name, sizeof(name));
+  auto read = readlink(link, name, sizeof(name) - 1);
   if (-1 == read) {
     return nullptr;
   } else {

diff --git a/util/hash_cuckoo_rep.cc b/util/hash_cuckoo_rep.cc
@@ -70,7 +70,7 @@ class HashCuckooRep : public MemTableRep {
     }
 
     cuckoo_path_ = reinterpret_cast<int*>(
-        arena_->Allocate(sizeof(int*) * (cuckoo_path_max_depth_ + 1)));
+        arena_->Allocate(sizeof(int) * (cuckoo_path_max_depth_ + 1)));
     is_nearly_full_ = false;
   }
 

diff --git a/util/ldb_cmd.cc b/util/ldb_cmd.cc
@@ -541,6 +541,7 @@ void ManifestDumpCommand::DoCommand() {
         } else {
           exec_state_ = LDBCommandExecuteResult::FAILED(
             "Multiple MANIFEST files found; use --path to select one");
+          closedir(d);
           return;
         }
       }

diff --git a/utilities/spatialdb/spatial_db.cc b/utilities/spatialdb/spatial_db.cc
@@ -221,6 +221,7 @@ std::string FeatureSet::DebugString() const {
     switch (iter.second.type()) {
       case Variant::kNull:
         out.append("null");
+        break;
       case Variant::kBool:
         if (iter.second.get_bool()) {
           out.append("true");