summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2023-07-20 16:54:30 +0200
committerTor Egge <Tor.Egge@online.no>2023-07-20 16:54:30 +0200
commitb3719513da44228ca391180c016a1e4b6bf13296 (patch)
tree94ad0bed0cf4f366ad3584c34d26233174fe6afa
parent509ea4b6f4b49488f1ed02d728650a6890af96b1 (diff)
Remove vespalib::stat and vespalib::getFileSize.
-rw-r--r--vespalib/src/tests/io/fileutil/fileutiltest.cpp14
-rw-r--r--vespalib/src/vespa/vespalib/io/fileutil.cpp13
-rw-r--r--vespalib/src/vespa/vespalib/io/fileutil.h18
3 files changed, 4 insertions, 41 deletions
diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
index 5e64bfa7192..0948d18304e 100644
--- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp
+++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
@@ -168,23 +168,17 @@ TEST("require that vespalib::File::stat works")
EXPECT_EQUAL(false, fileExists("myfile"));
EXPECT_EQUAL(false, fileExists("mydir"));
std::filesystem::create_directory(std::filesystem::path("mydir"));
- FileInfo::UP info = stat("myfile");
- ASSERT_TRUE(info.get() == 0);
File f("myfile");
f.open(File::CREATE, false);
f.write("foobar", 6, 0);
- info = stat("myfile");
- ASSERT_TRUE(info.get() != 0);
- FileInfo info2 = f.stat();
- EXPECT_EQUAL(*info, info2);
- EXPECT_EQUAL(6, info->_size);
- EXPECT_EQUAL(true, info->_plainfile);
- EXPECT_EQUAL(false, info->_directory);
+ FileInfo info = f.stat();
+ EXPECT_EQUAL(6, info._size);
+ EXPECT_EQUAL(true, info._plainfile);
+ EXPECT_EQUAL(false, info._directory);
EXPECT_EQUAL(6, f.getFileSize());
f.close();
- EXPECT_EQUAL(6, getFileSize("myfile"));
EXPECT_EQUAL(true, fileExists("myfile"));
EXPECT_EQUAL(true, fileExists("mydir"));
diff --git a/vespalib/src/vespa/vespalib/io/fileutil.cpp b/vespalib/src/vespa/vespalib/io/fileutil.cpp
index 1b63a5b0910..2c817a2789b 100644
--- a/vespalib/src/vespa/vespalib/io/fileutil.cpp
+++ b/vespalib/src/vespa/vespalib/io/fileutil.cpp
@@ -460,13 +460,6 @@ chdir(const string & directory)
LOG(debug, "chdir(%s): Working directory changed.", directory.c_str());
}
-FileInfo::UP
-stat(const string & path)
-{
- struct ::stat filestats;
- return processStat(filestats, ::stat(path.c_str(), &filestats) == 0, path);
-}
-
namespace {
uint32_t diskAlignmentSize = 4_Ki;
@@ -556,10 +549,4 @@ getOpenErrorString(const int osError, stringref filename)
return os.str();
}
-bool
-isDirectory(const string & path) {
- FileInfo::UP info(stat(path));
- return (info.get() && info->_directory);
-}
-
} // vespalib
diff --git a/vespalib/src/vespa/vespalib/io/fileutil.h b/vespalib/src/vespa/vespalib/io/fileutil.h
index 0d1f5ea7543..f9769936122 100644
--- a/vespalib/src/vespa/vespalib/io/fileutil.h
+++ b/vespalib/src/vespa/vespalib/io/fileutil.h
@@ -224,24 +224,6 @@ extern vespalib::string getCurrentDirectory();
extern void chdir(const vespalib::string & directory);
/**
- * Stat a file.
- *
- * @throw IoException If we failed to stat the file.
- * @return A file info object if everything went well, a null pointer if the
- * file was not found.
- */
-extern FileInfo::UP stat(const vespalib::string & path);
-
-/**
- * Get the filesize of the given file. Ignoring if it exists or not.
- * (None-existing files will be reported to have size zero)
- */
-extern inline off_t getFileSize(const vespalib::string & path) {
- FileInfo::UP info(stat(path));
- return (info.get() == 0 ? 0 : info->_size);
-}
-
-/**
* List the contents of the given directory.
*/
using DirectoryList = std::vector<vespalib::string>;