summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-13 12:28:04 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-13 12:28:04 +0100
commit1d9b8e58340e0fdc77158f04c36f5e6736754259 (patch)
tree059c041a15c6f1eacc42b065882af3d2f80049de
parent0655ef96fd88e3443009486256ce7bab43a27e56 (diff)
util: drop two unused calls from src/basic/
-rw-r--r--src/basic/fdset.c13
-rw-r--r--src/basic/fdset.h1
-rw-r--r--src/basic/fs-util.c18
-rw-r--r--src/basic/fs-util.h1
4 files changed, 0 insertions, 33 deletions
diff --git a/src/basic/fdset.c b/src/basic/fdset.c
index 3674d3ed9d..06f8ecbdbc 100644
--- a/src/basic/fdset.c
+++ b/src/basic/fdset.c
@@ -94,19 +94,6 @@ int fdset_put(FDSet *s, int fd) {
return set_put(MAKE_SET(s), FD_TO_PTR(fd));
}
-int fdset_consume(FDSet *s, int fd) {
- int r;
-
- assert(s);
- assert(fd >= 0);
-
- r = fdset_put(s, fd);
- if (r <= 0)
- safe_close(fd);
-
- return r;
-}
-
int fdset_put_dup(FDSet *s, int fd) {
int copy, r;
diff --git a/src/basic/fdset.h b/src/basic/fdset.h
index 12d0cef761..16efe5bdf2 100644
--- a/src/basic/fdset.h
+++ b/src/basic/fdset.h
@@ -32,7 +32,6 @@ FDSet* fdset_free(FDSet *s);
int fdset_put(FDSet *s, int fd);
int fdset_put_dup(FDSet *s, int fd);
-int fdset_consume(FDSet *s, int fd);
bool fdset_contains(FDSet *s, int fd);
int fdset_remove(FDSet *s, int fd);
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 3ef1b90edd..51268828af 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -283,24 +283,6 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
return 0;
}
-int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid) {
- assert(fd >= 0);
-
- /* Under the assumption that we are running privileged we
- * first change the access mode and only then hand out
- * ownership to avoid a window where access is too open. */
-
- if (mode != MODE_INVALID)
- if (fchmod(fd, mode) < 0)
- return -errno;
-
- if (uid != UID_INVALID || gid != GID_INVALID)
- if (fchown(fd, uid, gid) < 0)
- return -errno;
-
- return 0;
-}
-
int fchmod_umask(int fd, mode_t m) {
mode_t u;
int r;
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 0e2fcb21b9..0d23f8635f 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -43,7 +43,6 @@ int readlink_and_canonicalize(const char *p, char **r);
int readlink_and_make_absolute_root(const char *root, const char *path, char **ret);
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
-int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid);
int fchmod_umask(int fd, mode_t mode);