Merge branch 'journal'

[elogind.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 1a2dd5825da45eaa359db7f0f34cb510c02bcdbf..ac2ec8c35108e4c20fa6e73776b878fb8a91993e 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -366,6 +366,7 @@ int get_ctty_devnr(pid_t pid, dev_t *d);
 int get_ctty(pid_t, dev_t *_devnr, char **r);
 
 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 rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky);
 
@@ -377,11 +378,12 @@ void status_vprintf(const char *format, va_list ap);
 void status_printf(const char *format, ...);
 void status_welcome(void);
 
-int columns(void);
+unsigned columns(void);
 
 int running_in_chroot(void);
 
-char *ellipsize(const char *s, unsigned length, unsigned percent);
+char *ellipsize(const char *s, size_t length, unsigned percent);
+char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
 
 int touch(const char *path);
 
@@ -514,4 +516,6 @@ bool kexec_loaded(void);
 
 int prot_from_flags(int flags);
 
+unsigned long cap_last_cap(void);
+
 #endif