From 2104b91ab1d7ef585f01578406b0bed3da348460 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sun, 17 May 2020 11:49:14 -0700 Subject: made explicit casts to remove warning spam --- sys/libbio/test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sys') diff --git a/sys/libbio/test.c b/sys/libbio/test.c index b7cbae1..9926764 100644 --- a/sys/libbio/test.c +++ b/sys/libbio/test.c @@ -99,14 +99,14 @@ test·newick() bio·Node **end, **it, **list; heap = mem·makearena(mem·sys, nil); - rdr = (io·Peeker){.get = &io·getbyte, .unget = &io·ungetbyte}; - wtr = (io·Putter){.put = &io·putbyte, .putstr = &io·putstring}; + rdr = (io·Peeker){.get = (byte (*)(void *))io·getbyte, .unget = (error (*)(void *, byte))io·ungetbyte}; + wtr = (io·Putter){.put = (error (*)(void *, byte))io·putbyte, .putstr = (int (*)(void *, string))io·putstring}; fd[0] = io·open("/home/nolln/root/data/test/zika.nwk", "r"); fd[1] = io·open("/home/nolln/root/data/test/zika.proc.nwk", "w"); t.h = heap; - t.heap = (mem·Allocator){ .alloc = &mem·arenaalloc, .free = nil, }; + t.heap = (mem·Allocator){ .alloc = (void *(*)(void *, uint, ulong))mem·arenaalloc, .free = nil, }; if (err = bio·readnewick(rdr, fd[0], &t), err) { errorf("failed to read newick"); @@ -168,7 +168,7 @@ test·fasta() io·seek(fd, 0, seek·set); #endif - rdr = bio·openfasta((io·Reader){.read = &io·read}, fd, mem·sys, nil); + rdr = bio·openfasta((io·Reader){.read = (int (*)(void *, int, int, void *))io·read}, fd, mem·sys, nil); t = clock(); err = 0; @@ -184,6 +184,7 @@ test·fasta() return err <= 0 ? 0 : 1; } +#define asrdr(x) (int (*)(void *, int, int, void *))(x) error test·fastq() { @@ -197,7 +198,7 @@ test·fastq() fd = io·open("/home/nolln/root/data/test/eg.fq", "r"); - rdr = bio·openfastq((io·Reader){.read = &io·read}, fd, mem·sys, nil); + rdr = bio·openfastq((io·Reader){.read = asrdr(io·read)}, fd, mem·sys, nil); t = clock(); err = 0; -- cgit v1.2.1