X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/e63124bc579bfd97cfe2f620ddd84df9f20477d8..c5e0e40378b7e209521d2e9a52f055575a948313:/test/tvec-main.c diff --git a/test/tvec-main.c b/test/tvec-main.c index 25698a8..a9cff8f 100644 --- a/test/tvec-main.c +++ b/test/tvec-main.c @@ -56,7 +56,7 @@ static const struct outform { { 0, 0 } }; -const struct tvec_info tvec_adhocinfo = +const struct tvec_config tvec_adhocconfig = { 0, 1, 1, sizeof(struct tvec_reg) }; static const struct outform *find_outform(const char *p) @@ -103,7 +103,7 @@ Options:\n\ } void tvec_parseargs(int argc, char *argv[], struct tvec_state *tv_out, - int *argpos_out, const struct tvec_info *info) + int *argpos_out, const struct tvec_config *config) { FILE *ofp = 0; const struct outform *of = 0; @@ -155,7 +155,7 @@ void tvec_parseargs(int argc, char *argv[], struct tvec_state *tv_out, if (of) o = of->makefn(ofp); else o = tvec_dfltout(ofp); - tvec_begin(tv_out, info, o); *argpos_out = optind; + tvec_begin(tv_out, config, o); *argpos_out = optind; } int tvec_readstdin(struct tvec_state *tv) @@ -223,12 +223,12 @@ int tvec_readargs(int argc, char *argv[], struct tvec_state *tv, } int tvec_main(int argc, char *argv[], - const struct tvec_info *info, const char *dflt) + const struct tvec_config *config, const char *dflt) { struct tvec_state tv; int argpos; - tvec_parseargs(argc, argv, &tv, &argpos, info); + tvec_parseargs(argc, argv, &tv, &argpos, config); tvec_readargs(argc, argv, &tv, &argpos, dflt); return (tvec_end(&tv)); }