X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Flog.h;h=794af7be6af64aa004424d01131e558d418546bc;hp=0dc5c261008fd46c22e1b794d566c26a47650581;hb=9f1c19405a1ccaf59dcc8c32c13a1619541189ad;hpb=f24e86530ce0645e88022497af7d238f9c366946 diff --git a/src/shared/log.h b/src/shared/log.h index 0dc5c2610..794af7be6 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -21,9 +21,10 @@ along with systemd; If not, see . ***/ -#include #include #include +#include +#include #include #include "macro.h" @@ -51,7 +52,9 @@ int log_set_target_from_string(const char *e); int log_set_max_level_from_string(const char *e); void log_show_color(bool b); +bool log_get_show_color(void) _pure_; void log_show_location(bool b); +bool log_get_show_location(void) _pure_; int log_show_color_from_string(const char *e); int log_show_location_from_string(const char *e); @@ -124,13 +127,19 @@ int log_dump_internal( const char *func, char *buffer); -_noreturn_ void log_assert_failed( +noreturn void log_assert_failed( + const char *text, + const char *file, + int line, + const char *func); + +noreturn void log_assert_failed_unreachable( const char *text, const char *file, int line, const char *func); -_noreturn_ void log_assert_failed_unreachable( +void log_assert_failed_return( const char *text, const char *file, int line, @@ -161,3 +170,5 @@ const char *log_target_to_string(LogTarget target) _const_; LogTarget log_target_from_string(const char *s) _pure_; #define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x) + +void log_received_signal(int level, const struct signalfd_siginfo *si);