From f28fc0257e7de7a8680716606022ef98e5dafc29 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 14 Aug 2004 10:13:20 +0000 Subject: [PATCH] Removed superfluous GetStat() in the setter methods. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8570 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/storage/Statable.cpp | 58 +++++++++-------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/src/kits/storage/Statable.cpp b/src/kits/storage/Statable.cpp index dac0f2d9b3..b1124413dc 100644 --- a/src/kits/storage/Statable.cpp +++ b/src/kits/storage/Statable.cpp @@ -109,14 +109,9 @@ BStatable::GetOwner(uid_t *owner) const status_t BStatable::SetOwner(uid_t owner) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_uid = owner; - error = set_stat(statData, WSTAT_UID); - } - return error; + statData.st_uid = owner; + return set_stat(statData, WSTAT_UID); } /*! \brief Returns the group owner of the node. @@ -142,14 +137,9 @@ BStatable::GetGroup(gid_t *group) const status_t BStatable::SetGroup(gid_t group) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_gid = group; - error = set_stat(statData, WSTAT_GID); - } - return error; + statData.st_gid = group; + return set_stat(statData, WSTAT_GID); } /*! \brief Returns the permissions of the node. @@ -175,14 +165,11 @@ BStatable::GetPermissions(mode_t *perms) const status_t BStatable::SetPermissions(mode_t perms) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_mode = (statData.st_mode & ~S_IUMSK) | (perms & S_IUMSK); - error = set_stat(statData, WSTAT_MODE); - } - return error; + // the FS should do the correct masking -- only the S_IUMSK part is + // modifiable + statData.st_mode = perms; + return set_stat(statData, WSTAT_MODE); } /*! \brief Get the size of the node's data (not counting attributes). @@ -224,14 +211,9 @@ BStatable::GetModificationTime(time_t *mtime) const status_t BStatable::SetModificationTime(time_t mtime) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_mtime = mtime; - error = set_stat(statData, WSTAT_MTIME); - } - return error; + statData.st_mtime = mtime; + return set_stat(statData, WSTAT_MTIME); } /*! \brief Returns the time the node was created. @@ -257,14 +239,9 @@ BStatable::GetCreationTime(time_t *ctime) const status_t BStatable::SetCreationTime(time_t ctime) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_crtime = ctime; - error = set_stat(statData, WSTAT_CRTIME); - } - return error; + statData.st_crtime = ctime; + return set_stat(statData, WSTAT_CRTIME); } /*! \brief Returns the time the node was accessed. @@ -292,14 +269,9 @@ BStatable::GetAccessTime(time_t *atime) const status_t BStatable::SetAccessTime(time_t atime) { - status_t error; struct stat statData; - error = GetStat(&statData); - if (error == B_OK) { - statData.st_atime = atime; - error = set_stat(statData, WSTAT_ATIME); - } - return error; + statData.st_atime = atime; + return set_stat(statData, WSTAT_ATIME); } /*! \brief Returns the volume the node lives on. @@ -323,5 +295,3 @@ void BStatable::_OhSoStatable1() {} void BStatable::_OhSoStatable2() {} void BStatable::_OhSoStatable3() {} - -