diff --git a/slog/slog.h b/slog/slog.h index 683f83d..a498219 100644 --- a/slog/slog.h +++ b/slog/slog.h @@ -78,7 +78,7 @@ typedef struct SlogLogger { void (*Handler)(struct SlogLogger *self, SlogLevel level, const char *msg, const SlogAttr *attrs, int attrCount, const SlogSource *src); - SlogHandlerOpts *Opts; + SlogHandlerOpts Opts; } SlogLogger; static int slogUtcOffsetMinutes(time_t t) @@ -325,8 +325,8 @@ static inline void SlogTextHandler(struct SlogLogger *self, SlogLevel level, const char *msg, const SlogAttr *attrs, int attrCount, const SlogSource *src) { - if (self && self->Opts) { - if (level < self->Opts->MinLevel) { + if (self) { + if (level < self->Opts.MinLevel) { return; } } @@ -335,11 +335,11 @@ static inline void SlogTextHandler(struct SlogLogger *self, SlogLevel level, const char *prefix = NULL; bool add_source = false; - if (self && self->Opts) { - if (self->Opts->File) - out = self->Opts->File; - prefix = self->Opts->Prefix; - add_source = self->Opts->AddSource; + if (self) { + if (self->Opts.File) + out = self->Opts.File; + prefix = self->Opts.Prefix; + add_source = self->Opts.AddSource; } char tbuf[64]; @@ -477,7 +477,7 @@ static inline void SlogTextHandler(struct SlogLogger *self, SlogLevel level, #define SLOG_DEFAULT_TEXT_LOGGER \ (SlogLogger) \ { \ - .Handler = SlogTextHandler, .Opts = &(SlogHandlerOpts) \ + .Handler = SlogTextHandler, .Opts = (SlogHandlerOpts) \ { \ .File = stdout, .Prefix = NULL, .AddSource = false, \ .Json = false \ @@ -487,7 +487,7 @@ static inline void SlogTextHandler(struct SlogLogger *self, SlogLevel level, #define SLOG_DEFAULT_JSON_LOGGER \ (SlogLogger) \ { \ - .Handler = SlogTextHandler, .Opts = &(SlogHandlerOpts) \ + .Handler = SlogTextHandler, .Opts = (SlogHandlerOpts) \ { \ .File = stdout, .Prefix = NULL, .AddSource = true, \ .Json = true \