From 9cac309394ff76cea80ede49e0fa2ba989217c00 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 18 Jun 2013 19:46:19 +0000 Subject: [PATCH] Remove uniqueID from PathV1.h. llvm-svn: 184219 --- include/llvm/Support/PathV1.h | 4 +--- lib/Support/Unix/Path.inc | 1 - lib/Support/Windows/Path.inc | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/llvm/Support/PathV1.h b/include/llvm/Support/PathV1.h index eaf25508696..b38b1b090ed 100644 --- a/include/llvm/Support/PathV1.h +++ b/include/llvm/Support/PathV1.h @@ -45,19 +45,17 @@ namespace sys { uint32_t mode; ///< Mode of the file, if applicable uint32_t user; ///< User ID of owner, if applicable uint32_t group; ///< Group ID of owner, if applicable - uint64_t uniqueID; ///< A number to uniquely ID this file bool isDir : 1; ///< True if this is a directory. bool isFile : 1; ///< True if this is a file. FileStatus() : fileSize(0), modTime(0,0), mode(0777), user(999), - group(999), uniqueID(0), isDir(false), isFile(false) { } + group(999), isDir(false), isFile(false) { } TimeValue getTimestamp() const { return modTime; } uint64_t getSize() const { return fileSize; } uint32_t getMode() const { return mode; } uint32_t getUser() const { return user; } uint32_t getGroup() const { return group; } - uint64_t getUniqueID() const { return uniqueID; } }; /// This class provides an abstraction for the path to a file or directory diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index 57f02be1094..02f2fb12544 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -374,7 +374,6 @@ PathWithStatus::getFileStatus(bool update, std::string *ErrStr) const { status.mode = buf.st_mode; status.user = buf.st_uid; status.group = buf.st_gid; - status.uniqueID = uint64_t(buf.st_ino); status.isDir = S_ISDIR(buf.st_mode); status.isFile = S_ISREG(buf.st_mode); fsIsValid = true; diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index 4a6e56350b4..1e453d01ee4 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -290,13 +290,6 @@ PathWithStatus::getFileStatus(bool update, std::string *ErrStr) const { status.user = 9999; // Not applicable to Windows, so... status.group = 9999; // Not applicable to Windows, so... - // FIXME: this is only unique if the file is accessed by the same file path. - // How do we do this for C:\dir\file and ..\dir\file ? Unix has inode - // numbers, but the concept doesn't exist in Windows. - status.uniqueID = 0; - for (unsigned i = 0; i < path.length(); ++i) - status.uniqueID += path[i]; - ULARGE_INTEGER ui; ui.LowPart = fi.ftLastWriteTime.dwLowDateTime; ui.HighPart = fi.ftLastWriteTime.dwHighDateTime;