Merge pull request #19 from elogind/dev_v231

[elogind.git] / src / basic / stat-util.h

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 7c93dd505b4fd4f8806b119dea5ca8b783007406..077bfdd50d1f019b47a611a0fc1910d06e32bc7d 100644 (file)
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -22,20 +20,23 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 
 #include "macro.h"
 
-// UNNEEDED int is_symlink(const char *path);
+#if 0 /// UNNEEDED by elogind
+int is_symlink(const char *path);
+#endif // 0
 int is_dir(const char *path, bool follow);
-// UNNEEDED int is_device_node(const char *path);
+#if 0 /// UNNEEDED by elogind
+int is_device_node(const char *path);
 
-// UNNEEDED int dir_is_empty(const char *path);
+int dir_is_empty(const char *path);
 
-/// UNNEEDED by elogind
-#if 0
 static inline int dir_is_populated(const char *path) {
         int r;
         r = dir_is_empty(path);
@@ -47,21 +48,26 @@ static inline int dir_is_populated(const char *path) {
 
 bool null_or_empty(struct stat *st) _pure_;
 int null_or_empty_path(const char *fn);
-// UNNEEDED int null_or_empty_fd(int fd);
+#if 0 /// UNNEEDED by elogind
+int null_or_empty_fd(int fd);
+#endif // 0
 
 int path_is_read_only_fs(const char *path);
-// UNNEEDED int path_is_os_tree(const char *path);
+#if 0 /// UNNEEDED by elogind
+int path_is_os_tree(const char *path);
+#endif // 0
 
 int files_same(const char *filea, const char *fileb);
 
 /* The .f_type field of struct statfs is really weird defined on
- * different archs. Let's use our own type we know is sufficiently
- * larger to store the possible values. */
-typedef long statfs_f_type_t;
+ * different archs. Let's give its type a name. */
+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_;
-// UNNEEDED int fd_check_fstype(int fd, statfs_f_type_t magic_value);
-// UNNEEDED int path_check_fstype(const char *path, statfs_f_type_t magic_value);
+#if 0 /// UNNEEDED by elogind
+int fd_check_fstype(int fd, statfs_f_type_t magic_value);
+int path_check_fstype(const char *path, statfs_f_type_t magic_value);
+#endif // 0
 
 bool is_temporary_fs(const struct statfs *s) _pure_;
 int fd_is_temporary_fs(int fd);