diff options
Diffstat (limited to 'third_party/nix/src/libmain')
-rw-r--r-- | third_party/nix/src/libmain/shared.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/libmain/shared.hh | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc index 05ae04714fd0..dfa5be08979e 100644 --- a/third_party/nix/src/libmain/shared.cc +++ b/third_party/nix/src/libmain/shared.cc @@ -23,7 +23,9 @@ namespace nix { static bool gcWarning = true; void printGCWarning() { - if (!gcWarning) return; + if (!gcWarning) { + return; + } static bool haveWarned = false; if (!haveWarned) { diff --git a/third_party/nix/src/libmain/shared.hh b/third_party/nix/src/libmain/shared.hh index 2f9bc1a72ab0..337c38413da7 100644 --- a/third_party/nix/src/libmain/shared.hh +++ b/third_party/nix/src/libmain/shared.hh @@ -59,16 +59,18 @@ N getIntArg(const string& opt, Strings::iterator& i, if (allowUnit && !s.empty()) { char u = std::toupper(*s.rbegin()); if (std::isalpha(u)) { - if (u == 'K') + if (u == 'K') { multiplier = 1ULL << 10; - else if (u == 'M') + } else if (u == 'M') { multiplier = 1ULL << 20; - else if (u == 'G') + } else if (u == 'G') { multiplier = 1ULL << 30; - else if (u == 'T') + } else if (u == 'T') { multiplier = 1ULL << 40; - else - throw UsageError(format("invalid unit specifier '%1%'") % u); + } else { + throw + } + UsageError(format("invalid unit specifier '%1%'") % u); s.resize(s.size() - 1); } } |