util-lib: rename fd_check_fstype to fd_is_fs_type
Let's use "is" and "fs_type" for consistency with "is_fs_type". "check" is also more ambiguous than "is".
This commit is contained in:
parent
b12d25a8d6
commit
a66fee2e97
|
@ -735,7 +735,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
|
||||||
if (fstat(child, &st) < 0)
|
if (fstat(child, &st) < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
if ((flags & CHASE_NO_AUTOFS) &&
|
if ((flags & CHASE_NO_AUTOFS) &&
|
||||||
fd_check_fstype(child, AUTOFS_SUPER_MAGIC) > 0)
|
fd_is_fs_type(child, AUTOFS_SUPER_MAGIC) > 0)
|
||||||
return -EREMOTE;
|
return -EREMOTE;
|
||||||
|
|
||||||
if (S_ISLNK(st.st_mode)) {
|
if (S_ISLNK(st.st_mode)) {
|
||||||
|
|
|
@ -193,7 +193,7 @@ bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) {
|
||||||
return F_TYPE_EQUAL(s->f_type, magic_value);
|
return F_TYPE_EQUAL(s->f_type, magic_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
int fd_check_fstype(int fd, statfs_f_type_t magic_value) {
|
int fd_is_fs_type(int fd, statfs_f_type_t magic_value) {
|
||||||
struct statfs s;
|
struct statfs s;
|
||||||
|
|
||||||
if (fstatfs(fd, &s) < 0)
|
if (fstatfs(fd, &s) < 0)
|
||||||
|
@ -209,7 +209,7 @@ int path_check_fstype(const char *path, statfs_f_type_t magic_value) {
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
return fd_check_fstype(fd, magic_value);
|
return fd_is_fs_type(fd, magic_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_temporary_fs(const struct statfs *s) {
|
bool is_temporary_fs(const struct statfs *s) {
|
||||||
|
|
|
@ -57,7 +57,7 @@ int files_same(const char *filea, const char *fileb, int flags);
|
||||||
typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
|
typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
|
||||||
|
|
||||||
bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
|
bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
|
||||||
int fd_check_fstype(int fd, statfs_f_type_t magic_value);
|
int fd_is_fs_type(int fd, statfs_f_type_t magic_value);
|
||||||
int path_check_fstype(const char *path, statfs_f_type_t magic_value);
|
int path_check_fstype(const char *path, statfs_f_type_t magic_value);
|
||||||
|
|
||||||
bool is_temporary_fs(const struct statfs *s) _pure_;
|
bool is_temporary_fs(const struct statfs *s) _pure_;
|
||||||
|
|
Loading…
Reference in New Issue