From 9c43cd5dec0a8052580b5c073f570368b7287fa6 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Thu, 8 Mar 2018 13:56:31 +0100
Subject: [PATCH] src: avoid duplicate Before/AtExitCallback structs

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.
---
 src/env.cc |  8 ++++----
 src/env.h  | 10 +++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/env.cc b/src/env.cc
index f02cb36fe53f1e..5d2513b520d128 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -232,25 +232,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
index 8c73b8b206e6ec..c63ee76e2eb0ab 100644
--- 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_;