diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2016-12-15 20:29:10 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2016-12-16 22:20:05 +0100 |
| commit | 138d455393683532fb9d96fd398dfcdfa5d97057 (patch) | |
| tree | 2102e8ffa63c294bb2824ce5ff539c32694ed13a | |
| parent | c06ae6ba12a908bd87e00b27d00a79e305ea53c7 (diff) | |
| download | vis-138d455393683532fb9d96fd398dfcdfa5d97057.tar.gz vis-138d455393683532fb9d96fd398dfcdfa5d97057.tar.xz | |
text/core: fix make debug and related warnings
| -rw-r--r-- | core/Makefile | 10 | ||||
| -rw-r--r-- | core/array.c | 8 | ||||
| -rw-r--r-- | core/text.c | 7 |
3 files changed, 9 insertions, 16 deletions
diff --git a/core/Makefile b/core/Makefile index 3cf06ce..578d705 100644 --- a/core/Makefile +++ b/core/Makefile @@ -15,22 +15,22 @@ config.h: text: config.h text.c ../../text.c ../../text-util.c ../../text-motions.c ../../text-objects.c ../../text-regex.c @echo Compiling $@ binary - @${CC} ${CFLAGS} ${CFLAGS_STD} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ + @${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ buffer: config.h buffer.c ../../buffer.c @echo Compiling $@ binary - @${CC} ${CFLAGS} ${CFLAGS_STD} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ + @${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ map: config.h map.c ../../map.c @echo Compiling $@ binary - @${CC} ${CFLAGS} ${CFLAGS_STD} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ + @${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ array: config.h array.c ../../array.c @echo Compiling $@ binary - @${CC} ${CFLAGS} ${CFLAGS_STD} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ + @${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@ debug: clean - $(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS}' + $(MAKE) CFLAGS_EXTRA='${CFLAGS_DEBUG}' clean: @echo cleaning diff --git a/core/array.c b/core/array.c index 5f4f507..ced8e26 100644 --- a/core/array.c +++ b/core/array.c @@ -105,21 +105,21 @@ static void test_pointers(void) { items[i]->value = values[i]; Item *item; ok(array_add_ptr(&arr, items[i]) && array_length(&arr) == i+1, - "Add item: %zu = %p", i, items[i]); + "Add item: %zu = %p", i, (void*)items[i]); ok((item = array_get_ptr(&arr, i)) && item == items[i], - "Get item: %zu = %p", i, item); + "Get item: %zu = %p", i, (void*)item); } for (size_t i = 0; i < len; i++) { Item *item = items[len-i-1]; ok(array_set_ptr(&arr, i, item) && array_length(&arr) == len, - "Set item: %zu = %p", i, item); + "Set item: %zu = %p", i, (void*)item); } for (size_t i = 0; i < len; i++) { Item *item; ok((item = array_get_ptr(&arr, i)) && item == items[len-i-1], - "Get item: %zu = %p", i, item); + "Get item: %zu = %p", i, (void*)item); } array_clear(&arr); diff --git a/core/text.c b/core/text.c index 3da647a..8028599 100644 --- a/core/text.c +++ b/core/text.c @@ -20,13 +20,6 @@ static bool isempty(Text *txt) { return text_size(txt) == 0; } -static char *content(Text *txt) { - static char buf[BUFSIZ]; - size_t len = text_bytes_get(txt, 0, sizeof(buf)-1, buf); - buf[len] = '\0'; - return buf; -} - static bool compare(Text *txt, const char *data) { char buf[BUFSIZ]; size_t len = text_bytes_get(txt, 0, sizeof(buf)-1, buf); |