mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 04:56:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix urldb warning and test build

Browse Source
This commit is contained in:
Vincent Sanders 2016-08-08 13:52:54 +01:00
parent 05d2b9a92c
commit c1aec1cfa0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/urldb.c
View File

@ -1346,7 +1346,8 @@ static void urldb_dump_search(struct search_node *parent, int depth)
int i; /* index into string */ int i; /* index into string */
char s[1024]; char s[1024];
int r; int r;
int sl = sizeof(s) - 2;
if (parent == &empty) if (parent == &empty)
return; return;
@ -1358,8 +1359,8 @@ static void urldb_dump_search(struct search_node *parent, int depth)
for (h = parent->data; h; h = h->parent) { for (h = parent->data; h; h = h->parent) {
if (h->part) { if (h->part) {
r = snprintf(&s[i], (sizeof(s) - 2) - i, "%s", h->part); r = snprintf(&s[i], sl - i, "%s", h->part);
if ((i + r) > (sizeof(s) - 2)) { if ((i + r) > sl) {
break; break;
} }
i += r; i += r;

11
test/Makefile
View File

@ -11,7 +11,7 @@ nsurl_SRCS := utils/corestrings.c utils/nsurl.c utils/idna.c \
urldbtest_SRCS := content/urldb.c \ urldbtest_SRCS := content/urldb.c \
utils/idna.c utils/bloom.c utils/nsoption.c utils/nsurl.c \ utils/idna.c utils/bloom.c utils/nsoption.c utils/nsurl.c \
utils/corestrings.c \ utils/corestrings.c \
utils/hashtable.c utils/messages.c utils/utils.c \ utils/hashtable.c utils/messages.c utils/time.c utils/utils.c \
test/log.c test/urldbtest.c test/log.c test/urldbtest.c
# low level cache sources # low level cache sources
@ -85,8 +85,15 @@ endef
$(eval $(call pkg_cfg_detect_lib,check,Check)) $(eval $(call pkg_cfg_detect_lib,check,Check))
COMMON_WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wmissing-declarations -Wuninitialized
TESTCFLAGS := -std=c99 -g -Wall \ ifneq ($(CC_MAJOR),2)
COMMON_WARNFLAGS += -Wno-unused-parameter
endif
TESTCFLAGS := -std=c99 -g \
$(COMMON_WARNFLAGS) \
-D_BSD_SOURCE \ -D_BSD_SOURCE \
-D_POSIX_C_SOURCE=200809L \ -D_POSIX_C_SOURCE=200809L \
-D_XOPEN_SOURCE=600 \ -D_XOPEN_SOURCE=600 \