diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 21:47:13 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 21:47:13 +0000 |
| commit | 97b1d9934463ae2e43bf6efc64a1574a60af3535 (patch) | |
| tree | 9bef791fc4fae10e03c9546415e7f15f20e730a9 | |
| parent | ec8be66c331f905a4c8512ad3dae8cb75e02022a (diff) | |
| download | s6-dns-97b1d9934463ae2e43bf6efc64a1574a60af3535.tar.xz | |
Include deps.mak after config.mak (not before), for ${*_LIB} expansion
Cosmetic changes to s6dns_generic_filter_main (there's a segfault in
there, going to work on it)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/clients/s6dns_generic_filter_main.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -10,8 +10,8 @@ it: all CC = $(error Please use ./configure first) include package/targets.mak -include package/deps.mak -include config.mak +include package/deps.mak version_m := $(basename $(version)) version_M := $(basename $(version_m)) diff --git a/src/clients/s6dns_generic_filter_main.c b/src/clients/s6dns_generic_filter_main.c index 430b0c3..79260bd 100644 --- a/src/clients/s6dns_generic_filter_main.c +++ b/src/clients/s6dns_generic_filter_main.c @@ -31,7 +31,7 @@ struct line_s unsigned int pending : 1 ; } ; -#define LINE_ZERO { STRALLOC_ZERO, 0, 0, "\0", 0 } +#define LINE_ZERO { .swrd = STRALLOC_ZERO, .wpos = 0, .dpos = 0, .w = "\0", .pending = 0 } static void line_recycle (line_t_ref l) { @@ -85,7 +85,7 @@ int s6dns_generic_filter_main (int argc, char const *const *argv, char const *co strerr_diefu1sys(111, "ndelay_on") ; { - iopause_fd x[3] = { { 0, 0, 0 }, { 1, 0, 0 }, { -1, 0, 0 } } ; + iopause_fd x[3] = { { .fd = 0, .events = 0, .revents = 0 }, { .fd = 1, .events = 0, .revents = 0 }, { .fd = skadns_fd(&a), .events = 0, .revents = 0 } } ; uint16 lhead = 0, ltail = 0, numlines = 0, pending = 0 ; line_t storage[maxlines+1] ; uint16 lineindex[maxconn] ; @@ -158,7 +158,7 @@ int s6dns_generic_filter_main (int argc, char const *const *argv, char const *co for (; (numlines < maxlines) && (pending < maxconn) ; lhead = (lhead+1) % (maxlines+1), numlines++) { s6dns_domain_t d ; - register line_t_ref line = storage + lhead ; + register line_t *line = storage + lhead ; register int r = skagetln(buffer_0, &line->swrd, '\n') ; if (r < 0) { |