X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=04c9fcd71e4454830ce7a6f76595bcec1c9ec6d6;hb=a740c14c59907f370a6b3a3ba5a86fada88cb07e;hp=555e1d86658b71b5ea18f3c86310999ed96cfa7f;hpb=21baf21ae526d0180177cf4a26ce82d45b6103e2;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index 555e1d866..04c9fcd71 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -55,7 +55,9 @@ union dirent_storage { #define FORMAT_BYTES_MAX 8 #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" @@ -517,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))