src: avoid duplicate Before/AtExitCallback structs

danbev · danbev · commit e16a2be8d8ec · 2018-03-11T16:23:31.000+01:00
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: nodejs#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
@@ -293,25 +293,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
@@ -823,17 +823,13 @@ class Environment {
   static const int kFsStatsFieldsLength = 2 * 14;
   AliasedBuffer<double, v8::Float64Array> 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
`@@ -293,25 +293,25 @@ void Environment::PrintSyncTrace() const {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`void Environment::RunBeforeExitCallbacks() {`
`296`		`- for (BeforeExitCallback before_exit : before_exit_functions_) {`
	`296`	`+ for (ExitCallback before_exit : before_exit_functions_) {`
`297`	`297`	`before_exit.cb_(before_exit.arg_);`
`298`	`298`	`}`
`299`	`299`	`before_exit_functions_.clear();`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`void Environment::BeforeExit(void (cb)(void arg), void* arg) {`
`303`		`- before_exit_functions_.push_back(BeforeExitCallback{cb, arg});`
	`303`	`+ before_exit_functions_.push_back(ExitCallback{cb, arg});`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`void Environment::RunAtExitCallbacks() {`
`307`		`- for (AtExitCallback at_exit : at_exit_functions_) {`
	`307`	`+ for (ExitCallback at_exit : at_exit_functions_) {`
`308`	`308`	`at_exit.cb_(at_exit.arg_);`
`309`	`309`	`}`
`310`	`310`	`at_exit_functions_.clear();`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`void Environment::AtExit(void (cb)(void arg), void* arg) {`
`314`		`- at_exit_functions_.push_back(AtExitCallback{cb, arg});`
	`314`	`+ at_exit_functions_.push_back(ExitCallback{cb, arg});`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`void Environment::AddPromiseHook(promise_hook_func fn, void* arg) {`