refactor: remove superfluous boost::thread_interrupted catch #13739

pull hmel wants to merge 1 commits into bitcoin:master from hmel:dead-code-elimination changing 3 files +0 −15

hmel commented at 1:56 PM on July 22, 2018: contributor

No point in catching exception just to re-throw it
fanquake added the label Refactoring on Jul 22, 2018
MarcoFalke commented at 3:14 PM on July 22, 2018: member

Please don't mark non-doc code changes trivial.
hmel commented at 3:26 PM on July 22, 2018: contributor

Couldn't find a better category. What do you suggest?
MarcoFalke renamed this:
~~trivial: remove superfluous catch~~
refactor: remove superfluous catch
on Jul 22, 2018
MarcoFalke renamed this:
~~refactor: remove superfluous catch~~
trivial: remove superfluous boost::thread_interrupted catch
on Jul 22, 2018
MarcoFalke renamed this:
~~trivial: remove superfluous boost::thread_interrupted catch~~
refactor: remove superfluous boost::thread_interrupted catch
on Jul 22, 2018
fanquake commented at 5:03 AM on July 23, 2018: member

@hmel You can use refactor:. Please squash the commits and update commit message.
hmel force-pushed on Jul 23, 2018
hmel renamed this:
~~refactor: remove superfluous boost::thread_interrupted catch~~
WIP: refactor: remove superfluous boost::thread_interrupted catch
on Jul 23, 2018
refactor: remove superfluous boost::thread_interrupted catch 1757d88acc
hmel force-pushed on Jul 23, 2018
hmel renamed this:
~~WIP: refactor: remove superfluous boost::thread_interrupted catch~~
refactor: remove superfluous boost::thread_interrupted catch
on Jul 23, 2018

in src/bitcoin-cli.cpp:497 in 1757d88acc

 493 | @@ -494,9 +494,6 @@ static int CommandLineRPC(int argc, char *argv[])
 494 |              }
 495 |          } while (fWait);
 496 |      }
 497 | -    catch (const boost::thread_interrupted&) {
 498 | -        throw;
 499 | -    }
 500 |      catch (const std::exception& e) {

Empact commented at 5:46 PM on July 23, 2018:

The catch above is to give special treatment to boost::thread_interrupted, relative to the std::exception catch that follows. It's a way of excluding these from the std::exception treatment.

Empact commented at 5:46 PM on July 23, 2018: member

NACK 1757d88 these catches are not superfluous
hmel closed this on Jul 24, 2018
hmel deleted the branch on Jul 24, 2018
DrahtBot locked this on Sep 8, 2021

Contributors

Labels