move fs_traversal.h to util

cvmfs/swissknife_graft.cc

@@ -13,8 +13,8 @@
 #include <cstdio>
 #include <vector>
 
-#include "fs_traversal.h"
 #include "hash.h"
+#include "util/fs_traversal.h"
 #include "util/platform.h"
 #include "util/posix.h"
 

cvmfs/swissknife_scrub.cc

@@ -7,7 +7,7 @@
 #include "swissknife_scrub.h"
 #include "cvmfs_config.h"
 
-#include "fs_traversal.h"
+#include "util/fs_traversal.h"
 #include "util/logging.h"
 #include "util/posix.h"
 #include "util/smalloc.h"

cvmfs/sync_mediator.cc

@@ -17,7 +17,6 @@
 #include "catalog_virtual.h"
 #include "compression.h"
 #include "directory_entry.h"
-#include "fs_traversal.h"
 #include "hash.h"
 #include "json_document.h"
 #include "publish/repository.h"
@@ -25,6 +24,7 @@
 #include "upload.h"
 #include "util/concurrency.h"
 #include "util/exception.h"
+#include "util/fs_traversal.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"

cvmfs/sync_union_aufs.cc

@@ -9,8 +9,8 @@
 #include "sync_union.h"
 #include "sync_union_aufs.h"
 
-#include "fs_traversal.h"
 #include "sync_mediator.h"
+#include "util/fs_traversal.h"
 
 namespace publish {
 

cvmfs/sync_union_overlayfs.cc

@@ -11,9 +11,9 @@
 #include <string>
 #include <vector>
 
-#include "fs_traversal.h"
 #include "sync_mediator.h"
 #include "util/exception.h"
+#include "util/fs_traversal.h"
 #include "util/shared_ptr.h"
 
 namespace publish {

cvmfs/sync_union_tarball.cc

@@ -17,7 +17,6 @@
 #include <vector>
 
 #include "duplex_libarchive.h"
-#include "fs_traversal.h"
 #include "sync_item.h"
 #include "sync_item_dummy.h"
 #include "sync_item_tar.h"
@@ -25,6 +24,7 @@
 #include "sync_union.h"
 #include "util/concurrency.h"
 #include "util/exception.h"
+#include "util/fs_traversal.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 

cvmfs/fs_traversal.h → cvmfs/util/fs_traversal.h

@@ -5,8 +5,8 @@
  * of directories.
  */
 
-#ifndef CVMFS_FS_TRAVERSAL_H_
-#define CVMFS_FS_TRAVERSAL_H_
+#ifndef CVMFS_UTIL_FS_TRAVERSAL_H_
+#define CVMFS_UTIL_FS_TRAVERSAL_H_
 
 #include <errno.h>
 
@@ -266,4 +266,4 @@ class FileSystemTraversal {
 }  // namespace CVMFS_NAMESPACE_GUARD
 #endif
 
-#endif  // CVMFS_FS_TRAVERSAL_H_
+#endif  // CVMFS_UTIL_FS_TRAVERSAL_H_

cvmfs/util/posix.cc

@@ -50,10 +50,10 @@
 #include <string>
 #include <vector>
 
-#include "fs_traversal.h"
 #include "util/algorithm.h"
 #include "util/concurrency.h"
 #include "util/exception.h"
+#include "util/fs_traversal.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/string.h"

test/common/testutil.cc

@@ -15,10 +15,10 @@
 #include <map>
 #include <sstream>  // TODO(jblomer): remove me
 
-#include "fs_traversal.h"
 #include "hash.h"
 #include "manifest.h"
 #include "testutil.h"
+#include "util/fs_traversal.h"
 
 
 #ifndef __APPLE__

test/unittests/t_fs_traversal.cc

@@ -15,8 +15,8 @@
 #include <map>
 #include <string>
 
-#include "fs_traversal.h"
 #include "util/file_guard.h"
+#include "util/fs_traversal.h"
 #include "util/platform.h"
 #include "util/posix.h"
 

test/unittests/t_quota.cc

@@ -13,11 +13,11 @@
 
 #include "cache_posix.h"
 #include "compression.h"
-#include "fs_traversal.h"
 #include "hash.h"
 #include "quota_posix.h"
 #include "testutil.h"
 #include "util/algorithm.h"
+#include "util/fs_traversal.h"
 
 using namespace std;  // NOLINT