summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-25 09:47:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-25 09:47:11 +0000
commit54e45b30cc0dde9af781113efc18bd9a964a0a49 (patch)
treecd3f619d6ea40581ee0defdb3b670393cfc61d74 /file.c
parent57d4faec1bfe66496821b534ae5de66b1ecc04dc (diff)
* file.c (be_chown, be_fchown, eaccess): suppressed warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/file.c b/file.c
index 5b1431525d..ed8d27af17 100644
--- a/file.c
+++ b/file.c
@@ -74,11 +74,11 @@ int flock(int, int);
static int
be_chown(const char *path, uid_t owner, gid_t group)
{
- if (owner == -1 || group == -1) {
+ if (owner == (uid_t)-1 || group == (gid_t)-1) {
struct stat st;
if (stat(path, &st) < 0) return -1;
- if (owner == -1) owner = st.st_uid;
- if (group == -1) group = st.st_gid;
+ if (owner == (uid_t)-1) owner = st.st_uid;
+ if (group == (gid_t)-1) group = st.st_gid;
}
return chown(path, owner, group);
}
@@ -86,11 +86,11 @@ be_chown(const char *path, uid_t owner, gid_t group)
static int
be_fchown(int fd, uid_t owner, gid_t group)
{
- if (owner == -1 || group == -1) {
+ if (owner == (uid_t)-1 || group == (gid_t)-1) {
struct stat st;
if (fstat(fd, &st) < 0) return -1;
- if (owner == -1) owner = st.st_uid;
- if (group == -1) group = st.st_gid;
+ if (owner == (uid_t)-1) owner = st.st_uid;
+ if (group == (gid_t)-1) group = st.st_gid;
}
return fchown(fd, owner, group);
}
@@ -990,7 +990,7 @@ eaccess(const char *path, int mode)
else if (group_member(st.st_gid))
mode <<= 3;
- if ((st.st_mode & mode) == mode) return 0;
+ if ((int)(st.st_mode & mode) == mode) return 0;
return -1;
#else