From e758d6e3d8f5ceff2d63eb7defb38e9733682e69 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Oct 2015 21:09:21 +0100 Subject: [PATCH] main func cleanup --- main.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.cc b/main.cc index 26e0d8f..c7c0e51 100644 --- a/main.cc +++ b/main.cc @@ -318,6 +318,11 @@ struct ObState { return exec_func(target, rlist); } + int exec_main(ConstCharRange target) { + RuleCounter cnt(counters); + return cnt.wait_result(counters, exec_rule(target)); + } + void rule_add(const char *tgt, const char *dep, ostd::Uint32 *body) { auto targets = cscript::util::list_explode(tgt); auto deps = dep ? cscript::util::list_explode(dep) @@ -447,10 +452,5 @@ int main(int argc, char **argv) { if (os.rules.empty()) return os.error(1, "no targets"); - ObState::RuleCounter maincnt(os.counters); - int ret = os.exec_rule((optind < argc) ? argv[optind] : "all"); - ret = maincnt.wait_result(os.counters, ret); - if (ret) - return ret; - return 0; + return os.exec_main((optind < argc) ? argv[optind] : "all"); } \ No newline at end of file