diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-05 20:52:19 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-05 22:21:53 +0200 |
| commit | d89b795b474e538f8466c5867aafa25b130a84c6 (patch) | |
| tree | 05e7414ce5d43cf44fc1ea051872790b3f3ce7f5 | |
| parent | queueing: move from ctx to cb (diff) | |
| download | wireguard-monolithic-historical-d89b795b474e538f8466c5867aafa25b130a84c6.tar.xz wireguard-monolithic-historical-d89b795b474e538f8466c5867aafa25b130a84c6.zip | |
Makefile: clang now builds the kernel, so use scan-build
Also add little stub for coccinelle and clean up semicolon issue it
found.
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/selftest/routingtable.h | 6 | ||||
| -rw-r--r-- | src/tools/Makefile | 3 | ||||
| -rw-r--r-- | src/tools/config.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile index d47473e..a8a7265 100644 --- a/src/Makefile +++ b/src/Makefile @@ -61,9 +61,11 @@ tools: tools-debug: $(MAKE) -C tools V=1 DEBUG_TOOLS=y -check: - $(MAKE) -C $(KERNELDIR) M=$(PWD) C=2 CF="-D__CHECK_ENDIAN__" CONFIG_WIREGUARD_DEBUG=y - $(MAKE) -C tools check +check: clean + scan-build --view --keep-going $(MAKE) module tools CONFIG_WIREGUARD_DEBUG=y C=2 CF="-D__CHECK_ENDIAN__" + +coccicheck: clean + $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_WIREGUARD_DEBUG=y coccicheck MODE=report cloc: clean cloc $(wildcard *.c) $(wildcard *.h) diff --git a/src/selftest/routingtable.h b/src/selftest/routingtable.h index 2f052fa..951eb59 100644 --- a/src/selftest/routingtable.h +++ b/src/selftest/routingtable.h @@ -68,7 +68,7 @@ static __init void horrible_routing_table_free(struct horrible_routing_table *ta hlist_for_each_entry_safe (node, h, &table->head, table) { hlist_del(&node->table); kfree(node); - }; + } } static __init inline union nf_inet_addr horrible_cidr_to_mask(uint8_t cidr) { @@ -168,7 +168,7 @@ static __init void *horrible_routing_table_lookup_v4(struct horrible_routing_tab ret = node->value; break; } - }; + } return ret; } static __init void *horrible_routing_table_lookup_v6(struct horrible_routing_table *table, struct in6_addr *ip) @@ -182,7 +182,7 @@ static __init void *horrible_routing_table_lookup_v6(struct horrible_routing_tab ret = node->value; break; } - }; + } return ret; } diff --git a/src/tools/Makefile b/src/tools/Makefile index 1407de4..01f873c 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -80,9 +80,6 @@ install: wg @[ "$(WITH_WGQUICK)" = "yes" -a "$(WITH_SYSTEMDUNITS)" = "yes" ] || exit 0; \ install -v -d "$(DESTDIR)$(SYSTEMDUNITDIR)" && install -m 0644 -v wg-quick@.service "$(DESTDIR)$(SYSTEMDUNITDIR)/wg-quick@.service" -check: clean - CFLAGS=-g scan-build --view --keep-going $(MAKE) wg - help: @cat INSTALL diff --git a/src/tools/config.c b/src/tools/config.c index 0d8daeb..9f3f990 100644 --- a/src/tools/config.c +++ b/src/tools/config.c @@ -223,7 +223,7 @@ static inline bool parse_allowedips(struct wgpeer *peer, struct wgallowedip **la if (!mutable) { perror("strdup"); return false; - }; + } peer->flags |= WGPEER_REPLACE_ALLOWEDIPS; if (!strlen(value)) { free(mutable); |