From d1bb66976e36a8bdb43a15d0a30af4fb370e7af3 Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 5 Nov 2015 18:43:58 +0000 Subject: [PATCH] format --- main.cc | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/main.cc b/main.cc index 13a7893..07a32f2 100644 --- a/main.cc +++ b/main.cc @@ -178,22 +178,21 @@ struct ObState { int exec_list(const Vector &rlist, Vector &subdeps, ConstCharRange tname) { String repd; - for (auto &sr: rlist.iter()) - for (auto &target: sr.rule->deps.iter()) { - ConstCharRange atgt = target.iter(); - repd.clear(); - auto lp = ostd::find(atgt, '%'); - if (!lp.empty()) { - repd.append(slice_until(atgt, lp)); - repd.append(sr.sub); - lp.pop_front(); - if (!lp.empty()) repd.append(lp); - atgt = repd.iter(); - } - subdeps.push(atgt); - int r = exec_rule(atgt, tname); - if (r) return r; + for (auto &sr: rlist.iter()) for (auto &target: sr.rule->deps.iter()) { + ConstCharRange atgt = target.iter(); + repd.clear(); + auto lp = ostd::find(atgt, '%'); + if (!lp.empty()) { + repd.append(slice_until(atgt, lp)); + repd.append(sr.sub); + lp.pop_front(); + if (!lp.empty()) repd.append(lp); + atgt = repd.iter(); } + subdeps.push(atgt); + int r = exec_rule(atgt, tname); + if (r) return r; + } return 0; } @@ -399,7 +398,6 @@ int main(int argc, char **argv) { break; default: return ob_print_help(argv[0], ostd::err, 1); - break; } }