From 3c68635799f99f598f9deeadfc3e0ac04462f4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 10 Feb 2019 17:05:02 +0100 Subject: Minor cleanup. --- Makefile | 6 ++---- parse.c | 2 -- trie.inc.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 726c5949..26e3c09b 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,7 @@ CC := gcc OBJDIR = obj -# CPPFLAGS = -CFLAGS = $(CPPFLAGS) \ - -std=gnu11 -Wall -Wextra \ +CFLAGS = -std=gnu11 -Wall -Wextra \ -ggdb -fPIC \ $(shell guile-config compile) LDFLAGS = -fPIC $(shell guile-config link) @@ -29,7 +27,7 @@ parse: $(O_FILES) $(O_FILES): | $(OBJDIR) $(OBJDIR)/%.o : %.c $(H_FILES) $(X_FILES) - $(CC) -c -o $@ $< $(CFLAGS) + $(CC) -c $(CFLAGS) -o $@ $< $(OBJDIR): mkdir -p $(OBJDIR) diff --git a/parse.c b/parse.c index bc0b5491..33dfde30 100644 --- a/parse.c +++ b/parse.c @@ -138,8 +138,6 @@ int parse_file(char* filename, FILE* f, vcomponent* root) { } - INFO("Parsed file, cleaning up."); - FREE(content_line)(&cline); assert(POP(LLIST(vcomponent))(&ctx.comp_stack) == root); diff --git a/trie.inc.h b/trie.inc.h index 89ec1ec4..c6f3a0e8 100644 --- a/trie.inc.h +++ b/trie.inc.h @@ -146,7 +146,7 @@ int TRIE_DOT_HELP(TYPE) ( TRIE_NODE(TYPE)* root, FILE* f ) { if (! EMPTY(LLIST(key_val))(&root->value->params)) { fprintf(f, "subgraph \"cluster_param_%p\"{\n color=blue;\n", root); FOR(LLIST(key_val), link, &root->value->params) { - fprintf(f, "\"%p\" [label=\"%s := %s\"];", link, + fprintf(f, "\"%p\" [shape=rectangle, label=\"%s := %s\"];", link, link->value->key.mem, link->value->val.mem); } -- cgit v1.2.3