final style fixes

Author: jblomer

CPPLINT.cfg

@@ -1 +1,2 @@
+set noparent
 filter=+build/include_alpha,-runtime/arrays

cpplint.py

@@ -3930,12 +3930,12 @@ def CheckBraces(filename, clean_lines, linenum, error):
     # find the ( after the if
     pos = line.find('else if')
     pos = line.find('(', pos)
-    if pos > 0:
-      (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
-      brace_on_right = endline[endpos:].find('{') != -1
-      if brace_on_left != brace_on_right:    # must be brace after if
-        error(filename, linenum, 'readability/braces', 5,
-              'If an else has a brace on one side, it should have it on both')
+    #if pos > 0:
+    #  (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
+    #  brace_on_right = endline[endpos:].find('{') != -1
+    #  if brace_on_left != brace_on_right:    # must be brace after if
+    #    error(filename, linenum, 'readability/braces', 5,
+    #          'If an else has a brace on one side, it should have it on both')
   elif Search(r'}\s*else[^{]*$', line) or Match(r'[^}]*else\s*{', line):
     error(filename, linenum, 'readability/braces', 5,
           'If an else has a brace on one side, it should have it on both')

cpplint.py.cvmfs-patch

@@ -37,6 +37,25 @@
          not Match(r'\s*#', prevline)):
        error(filename, linenum, 'whitespace/braces', 4,
              '{ should almost always be at the end of the previous line')
+@@ -3927,12 +3930,12 @@
+     # find the ( after the if
+     pos = line.find('else if')
+     pos = line.find('(', pos)
+-    if pos > 0:
+-      (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
+-      brace_on_right = endline[endpos:].find('{') != -1
+-      if brace_on_left != brace_on_right:    # must be brace after if
+-        error(filename, linenum, 'readability/braces', 5,
+-              'If an else has a brace on one side, it should have it on both')
++    #if pos > 0:
++    #  (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
++    #  brace_on_right = endline[endpos:].find('{') != -1
++    #  if brace_on_left != brace_on_right:    # must be brace after if
++    #    error(filename, linenum, 'readability/braces', 5,
++    #          'If an else has a brace on one side, it should have it on both')
+   elif Search(r'}\s*else[^{]*$', line) or Match(r'[^}]*else\s*{', line):
+     error(filename, linenum, 'readability/braces', 5,
+           'If an else has a brace on one side, it should have it on both')
 @@ -4626,10 +4629,10 @@
    #
    # We also make an exception for Lua headers, which follow google

cvmfs/CPPLINT.cfg

@@ -0,0 +1 @@
+exclude_files=murmur\.h

cvmfs/catalog_counters.cc

@@ -29,9 +29,9 @@ void DeltaCounters::ApplyDelta(const DirectoryEntry &dirent, const int delta) {
 }
 
 
-void DeltaCounters::PopulateToParent(DeltaCounters &parent) const {
-  parent.subtree.Add(self);
-  parent.subtree.Add(subtree);
+void DeltaCounters::PopulateToParent(DeltaCounters *parent) const {
+  parent->subtree.Add(self);
+  parent->subtree.Add(subtree);
 }
 
 
@@ -41,15 +41,15 @@ void Counters::ApplyDelta(const DeltaCounters &delta) {
 }
 
 
-void Counters::AddAsSubtree(DeltaCounters &delta) const {
-  delta.subtree.Add(self);
-  delta.subtree.Add(subtree);
+void Counters::AddAsSubtree(DeltaCounters *delta) const {
+  delta->subtree.Add(self);
+  delta->subtree.Add(subtree);
 }
 
 
-void Counters::MergeIntoParent(DeltaCounters &parent_delta) const {
-  parent_delta.self.Add(self);
-  parent_delta.subtree.Subtract(self);
+void Counters::MergeIntoParent(DeltaCounters *parent_delta) const {
+  parent_delta->self.Add(self);
+  parent_delta->subtree.Subtract(self);
 }
 
 

cvmfs/catalog_counters.h

@@ -73,16 +73,16 @@ class TreeCountersBase {
       xattrs            += factor * other.xattrs;
     }
 
-    void FillFieldsMap(FieldsMap &map, const std::string &prefix) const {
-      map[prefix + "regular"]      = &regular_files;
-      map[prefix + "symlink"]      = &symlinks;
-      map[prefix + "dir"]          = &directories;
-      map[prefix + "nested"]       = &nested_catalogs;
-      map[prefix + "chunked"]      = &chunked_files;
-      map[prefix + "chunks"]       = &file_chunks;
-      map[prefix + "file_size"]    = &file_size;
-      map[prefix + "chunked_size"] = &chunked_file_size;
-      map[prefix + "xattr"]        = &xattrs;
+    void FillFieldsMap(const std::string &prefix, FieldsMap *map) const {
+      (*map)[prefix + "regular"]      = &regular_files;
+      (*map)[prefix + "symlink"]      = &symlinks;
+      (*map)[prefix + "dir"]          = &directories;
+      (*map)[prefix + "nested"]       = &nested_catalogs;
+      (*map)[prefix + "chunked"]      = &chunked_files;
+      (*map)[prefix + "chunks"]       = &file_chunks;
+      (*map)[prefix + "file_size"]    = &file_size;
+      (*map)[prefix + "chunked_size"] = &chunked_file_size;
+      (*map)[prefix + "xattr"]        = &xattrs;
     }
 
     FieldT regular_files;
@@ -118,7 +118,7 @@ class DeltaCounters : public TreeCountersBase<DeltaCounters_t> {
   friend class Counters;
 
  public:
-  void PopulateToParent(DeltaCounters &parent) const;
+  void PopulateToParent(DeltaCounters *parent) const;
   void Increment(const DirectoryEntry &dirent) { ApplyDelta(dirent,  1); }
   void Decrement(const DirectoryEntry &dirent) { ApplyDelta(dirent, -1); }
 
@@ -131,8 +131,8 @@ typedef uint64_t Counters_t;
 class Counters : public TreeCountersBase<Counters_t> {
  public:
   void ApplyDelta(const DeltaCounters &delta);
-  void AddAsSubtree(DeltaCounters &delta) const;
-  void MergeIntoParent(DeltaCounters &parent_delta) const;
+  void AddAsSubtree(DeltaCounters *delta) const;
+  void MergeIntoParent(DeltaCounters *parent_delta) const;
   Counters_t GetSelfEntries() const;
   Counters_t GetSubtreeEntries() const;
   Counters_t GetAllEntries() const;

cvmfs/catalog_counters_impl.h

@@ -2,6 +2,9 @@
  * This file is part of the CernVM File System.
  */
 
+#ifndef CVMFS_CATALOG_COUNTERS_IMPL_H_
+#define CVMFS_CATALOG_COUNTERS_IMPL_H_
+
 #include "catalog_sql.h"
 
 namespace catalog {
@@ -11,8 +14,8 @@ typename TreeCountersBase<FieldT>::FieldsMap
     TreeCountersBase<FieldT>::GetFieldsMap() const
 {
   FieldsMap map;
-  self.FillFieldsMap(map, "self_");
-  subtree.FillFieldsMap(map, "subtree_");
+  self.FillFieldsMap("self_", &map);
+  subtree.FillFieldsMap("subtree_", &map);
   return map;
 }
 
@@ -111,3 +114,5 @@ void TreeCountersBase<FieldT>::SetZero() {
 }
 
 }  // namespace catalog
+
+#endif  // CVMFS_CATALOG_COUNTERS_IMPL_H_

cvmfs/catalog_mgr_rw.cc

@@ -377,7 +377,7 @@ void WritableCatalogManager::AddChunkedFile(
  * @return true on success, false otherwise
  */
 void WritableCatalogManager::AddHardlinkGroup(
-  DirectoryEntryBaseList &entries,
+  const DirectoryEntryBaseList &entries,
   const XattrList        &xattrs,
   const std::string &parent_directory)
 {
@@ -412,7 +412,7 @@ void WritableCatalogManager::AddHardlinkGroup(
   assert(new_group_id > 0);
 
   // Add the file entries to the catalog
-  for (DirectoryEntryBaseList::iterator i = entries.begin(),
+  for (DirectoryEntryBaseList::const_iterator i = entries.begin(),
        iEnd = entries.end(); i != iEnd; ++i)
   {
     string file_path = parent_path + "/";
@@ -584,7 +584,7 @@ void WritableCatalogManager::CreateNestedCatalog(const std::string &mountpoint)
     retval = FindCatalog(i->path.ToString(), &grand_catalog);
     assert(retval);
     const Counters &grand_counters = grand_catalog->GetCounters();
-    grand_counters.AddAsSubtree(fix_subtree_counters);
+    grand_counters.AddAsSubtree(&fix_subtree_counters);
   }
   DeltaCounters save_counters = wr_new_catalog->delta_counters_;
   wr_new_catalog->delta_counters_ = fix_subtree_counters;
@@ -783,7 +783,7 @@ shash::Any WritableCatalogManager::SnapshotCatalog(WritableCatalog *catalog)
   catalog->UpdateCounters();
   if (catalog->parent()) {
     catalog->delta_counters_.PopulateToParent(
-      catalog->GetWritableParent()->delta_counters_);
+      &catalog->GetWritableParent()->delta_counters_);
   }
   catalog->delta_counters_.SetZero();
 

cvmfs/catalog_mgr_rw.h

@@ -89,7 +89,7 @@ class WritableCatalogManager : public SimpleCatalogManager {
   void RemoveDirectory(const std::string &directory_path);
 
   // Hardlink group handling
-  void AddHardlinkGroup(DirectoryEntryBaseList &entries,
+  void AddHardlinkGroup(const DirectoryEntryBaseList &entries,
                         const XattrList &xattrs,
                         const std::string &parent_directory);
   void ShrinkHardlinkGroup(const std::string &remove_path);

cvmfs/catalog_rw.cc

@@ -579,10 +579,10 @@ void WritableCatalog::MergeIntoParent() {
   CopyCatalogsToParent();
 
   // Fix counters in parent
-  delta_counters_.PopulateToParent(parent->delta_counters_);
+  delta_counters_.PopulateToParent(&parent->delta_counters_);
   Counters &counters = GetCounters();
   counters.ApplyDelta(delta_counters_);
-  counters.MergeIntoParent(parent->delta_counters_);
+  counters.MergeIntoParent(&parent->delta_counters_);
 
   // Remove the nested catalog reference for this nested catalog.
   // From now on this catalog will be dangling!

cvmfs/catalog_sql.cc

@@ -630,15 +630,14 @@ SqlDirentTouch::SqlDirentTouch(const CatalogDatabase &database) {
 
 bool SqlDirentTouch::BindDirentBase(const DirectoryEntryBase &entry) {
   return (
-    BindHashBlob(1, entry.checksum_)                                       &&
-    BindInt64   (2, entry.size_)                                           &&
-    BindInt     (3, entry.mode_)                                           &&
-    BindInt64   (4, entry.mtime_)                                          &&
-    BindText    (5, entry.name_.GetChars(),    entry.name_.GetLength())    &&
-    BindText    (6, entry.symlink_.GetChars(), entry.symlink_.GetLength()) &&
-    BindInt64   (7, entry.uid_)                                            &&
-    BindInt64   (8, entry.gid_)
-  );  // NOLINT
+    BindHashBlob(1, entry.checksum_) &&
+    BindInt64(2, entry.size_) &&
+    BindInt(3, entry.mode_) &&
+    BindInt64(4, entry.mtime_) &&
+    BindText(5, entry.name_.GetChars(),    entry.name_.GetLength()) &&
+    BindText(6, entry.symlink_.GetChars(), entry.symlink_.GetLength()) &&
+    BindInt64(7, entry.uid_) &&
+    BindInt64(8, entry.gid_));
 }