shared: inline trivial auto-cleanup functions

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index b5ad1ff3b5ddff08cd0b54d5a915e1c207cc9d6f..04c9fcd71e4454830ce7a6f76595bcec1c9ec6d6 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -57,6 +57,7 @@ union dirent_storage {
 #define ANSI_HIGHLIGHT_ON "\x1B[1;39m"
 #define ANSI_RED_ON "\x1B[31m"
 #define ANSI_HIGHLIGHT_RED_ON "\x1B[1;31m"
+#define ANSI_GREEN_ON "\x1B[32m"
 #define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
 #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m"
 #define ANSI_HIGHLIGHT_OFF "\x1B[0m"
@@ -518,12 +519,17 @@ void warn_melody(void);
 int get_shell(char **ret);
 int get_home_dir(char **ret);
 
-void freep(void *p);
+static inline void freep(void *p) {
+        free(*(void**) p);
+}
+
 void fclosep(FILE **f);
 void pclosep(FILE **f);
 void closep(int *fd);
 void closedirp(DIR **d);
-void umaskp(mode_t *u);
+static inline void umaskp(mode_t *u) {
+        umask(*u);
+}
 
 _malloc_  static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b == 0 || a > ((size_t) -1) / b))