diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/nslog/nslog.h | 11 | ||||
| -rw-r--r-- | src/Makefile | 12 | ||||
| -rw-r--r-- | src/core.c | 22 | ||||
| -rw-r--r-- | test/basictests.c | 14 |
5 files changed, 50 insertions, 11 deletions
@@ -7,7 +7,7 @@ # Component settings COMPONENT := nslog -COMPONENT_VERSION := 0.1.1 +COMPONENT_VERSION := 0.1.3 # Default to a static library COMPONENT_TYPE ?= lib-static diff --git a/include/nslog/nslog.h b/include/nslog/nslog.h index 9113527..d63ed48 100644 --- a/include/nslog/nslog.h +++ b/include/nslog/nslog.h @@ -48,6 +48,17 @@ typedef enum { */ const char *nslog_level_name(nslog_level level); +/** + * Convert a logging level to a short string. + * + * The returned string is owned by the nslog library (static) and should + * not be freed. It will be exactly four characters wide and suitable for + * logging to a file neatly. + * + * \param level The level for which you want the 'short' name. + */ +const char *nslog_short_level_name(nslog_level level); + #define NSLOG_LEVEL_DD NSLOG_LEVEL_DEEPDEBUG #define NSLOG_LEVEL_DBG NSLOG_LEVEL_DEBUG #define NSLOG_LEVEL_CHAT NSLOG_LEVEL_VERBOSE diff --git a/src/Makefile b/src/Makefile index 3ca70cd..d598cf5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,11 +4,17 @@ CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ SOURCES := $(SOURCES) $(BUILDDIR)/filter-parser.c $(BUILDDIR)/filter-lexer.c -$(BUILDDIR)/%-lexer.c $(BUILDDIR)/%-lexer.h: src/%-lexer.l +$(BUILDDIR)/%-lexer.inc $(BUILDDIR)/%-lexer.h: src/%-lexer.l $(VQ)$(ECHO) " FLEX: $<" - $(Q)$(FLEX) --outfile=$(BUILDDIR)/$(*F)-lexer.c --header-file=$(BUILDDIR)/$(*F)-lexer.h $< + $(Q)$(FLEX) --outfile=$(BUILDDIR)/$(*F)-lexer.inc --header-file=$(BUILDDIR)/$(*F)-lexer.h $< +.PRECIOUS: $(BUILDDIR)/%-lexer.inc -$(BUILDDIR)/%-lexer.c: $(BUILDDIR)/%-parser.h +$(BUILDDIR)/%-lexer.inc: $(BUILDDIR)/%-parser.h + +$(BUILDDIR)/%-lexer.c: $(BUILDDIR)/%-lexer.inc + $(Q)echo "#ifndef __clang_analyzer__" > $@ + $(Q)echo "#include \"$(notdir $<)\"" >> $@ + $(Q)echo "#endif" >> $@ # Bison 3.0 and later require api.prefix in curly braces # Bison 2.6 and later require api.prefix @@ -49,6 +49,28 @@ const char *nslog_level_name(nslog_level level) return "**UNKNOWN**"; } +const char *nslog_short_level_name(nslog_level level) +{ + switch (level) { + case NSLOG_LEVEL_DEEPDEBUG: + return "DDBG"; + case NSLOG_LEVEL_DEBUG: + return "DBG "; + case NSLOG_LEVEL_VERBOSE: + return "VERB"; + case NSLOG_LEVEL_INFO: + return "INFO"; + case NSLOG_LEVEL_WARNING: + return "WARN"; + case NSLOG_LEVEL_ERROR: + return "ERR "; + case NSLOG_LEVEL_CRITICAL: + return "CRIT"; + }; + + return "?UNK"; +} + static void nslog__normalise_category(nslog_category_t *cat) { diff --git a/test/basictests.c b/test/basictests.c index c6dd9dd..2650bfe 100644 --- a/test/basictests.c +++ b/test/basictests.c @@ -83,7 +83,7 @@ START_TEST (test_nslog_trivial_corked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_corked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -109,7 +109,7 @@ START_TEST (test_nslog_trivial_uncorked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_uncorked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -150,7 +150,7 @@ START_TEST (test_nslog_two_corked_messages) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_two_corked_messages") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -223,7 +223,7 @@ START_TEST (test_nslog_simple_filter_corked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_corked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -250,7 +250,7 @@ START_TEST (test_nslog_simple_filter_uncorked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_uncorked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -277,7 +277,7 @@ START_TEST (test_nslog_simple_filter_subcategory_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_subcategory_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -524,7 +524,7 @@ END_TEST START_TEST (test_nslog_filter_funcname) { nslog_filter_t *filter; - fail_unless(nslog_filter_funcname_new("test_nslog_filter_funcname", &filter) == NSLOG_NO_ERROR, + fail_unless(nslog_filter_funcname_new(__func__, &filter) == NSLOG_NO_ERROR, "Unable to create level filter"); fail_unless(nslog_filter_set_active(filter, NULL) == NSLOG_NO_ERROR, "Unable to set active filter to dir:test"); |