src: avoid duplicate Before/AtExitCallback structs

danbev · MylesBorins · commit 4b9914a318d8 · 2018-03-20T11:33:57.000Z
Currently, BeforeExitCallback and AtExitCallback are identical apart for the name of the struct. This commit introduces an ExitCallback struct with can be used in both cases to avoid the duplication. PR-URL: #19226 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env.cc b/src/env.cc
@@ -218,25 +218,25 @@ void Environment::PrintSyncTrace() const {
 }
 
 void Environment::RunBeforeExitCallbacks() {
-  for (BeforeExitCallback before_exit : before_exit_functions_) {
+  for (ExitCallback before_exit : before_exit_functions_) {
     before_exit.cb_(before_exit.arg_);
   }
   before_exit_functions_.clear();
 }
 
 void Environment::BeforeExit(void (*cb)(void* arg), void* arg) {
-  before_exit_functions_.push_back(BeforeExitCallback{cb, arg});
+  before_exit_functions_.push_back(ExitCallback{cb, arg});
 }
 
 void Environment::RunAtExitCallbacks() {
-  for (AtExitCallback at_exit : at_exit_functions_) {
+  for (ExitCallback at_exit : at_exit_functions_) {
     at_exit.cb_(at_exit.arg_);
   }
   at_exit_functions_.clear();
 }
 
 void Environment::AtExit(void (*cb)(void* arg), void* arg) {
-  at_exit_functions_.push_back(AtExitCallback{cb, arg});
+  at_exit_functions_.push_back(ExitCallback{cb, arg});
 }
 
 void Environment::AddPromiseHook(promise_hook_func fn, void* arg) {
diff --git a/src/env.h b/src/env.h
@@ -799,17 +799,13 @@ class Environment {
 
   double* fs_stats_field_array_;
 
-  struct BeforeExitCallback {
+  struct ExitCallback {
     void (*cb_)(void* arg);
     void* arg_;
   };
-  std::list<BeforeExitCallback> before_exit_functions_;
+  std::list<ExitCallback> before_exit_functions_;
 
-  struct AtExitCallback {
-    void (*cb_)(void* arg);
-    void* arg_;
-  };
-  std::list<AtExitCallback> at_exit_functions_;
+  std::list<ExitCallback> at_exit_functions_;
 
   struct PromiseHookCallback {
     promise_hook_func cb_;

Original file line number	Diff line number	Diff line change
`@@ -218,25 +218,25 @@ void Environment::PrintSyncTrace() const {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`void Environment::RunBeforeExitCallbacks() {`
`221`		`- for (BeforeExitCallback before_exit : before_exit_functions_) {`
	`221`	`+ for (ExitCallback before_exit : before_exit_functions_) {`
`222`	`222`	`before_exit.cb_(before_exit.arg_);`
`223`	`223`	`}`
`224`	`224`	`before_exit_functions_.clear();`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`void Environment::BeforeExit(void (cb)(void arg), void* arg) {`
`228`		`- before_exit_functions_.push_back(BeforeExitCallback{cb, arg});`
	`228`	`+ before_exit_functions_.push_back(ExitCallback{cb, arg});`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`void Environment::RunAtExitCallbacks() {`
`232`		`- for (AtExitCallback at_exit : at_exit_functions_) {`
	`232`	`+ for (ExitCallback at_exit : at_exit_functions_) {`
`233`	`233`	`at_exit.cb_(at_exit.arg_);`
`234`	`234`	`}`
`235`	`235`	`at_exit_functions_.clear();`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`void Environment::AtExit(void (cb)(void arg), void* arg) {`
`239`		`- at_exit_functions_.push_back(AtExitCallback{cb, arg});`
	`239`	`+ at_exit_functions_.push_back(ExitCallback{cb, arg});`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`void Environment::AddPromiseHook(promise_hook_func fn, void* arg) {`