From faf6d4ec1ae4dfd1fbd7e7e6bb5c683e6383494a Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Mon, 14 Dec 2020 13:07:05 -0800
Subject: [PATCH] Rename a 'do_net_run' variable to 'do_run_loop'

For clarity, since the net_run() function was renamed to run_loop().
---
 src/main.cc       | 10 +++++-----
 src/zeek-setup.cc |  4 ++--
 src/zeek-setup.h  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.cc b/src/main.cc
index c8b55c9f79..e96bfc9adf 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -16,11 +16,11 @@ int main(int argc, char** argv)
 		return setup_result.code;
 
 	auto& options = setup_result.options;
-	auto do_net_run = zeek::iosource_mgr->Size() > 0 ||
-	                  zeek::run_state::detail::have_pending_timers ||
-	                  zeek::BifConst::exit_only_after_terminate;
+	auto do_run_loop = zeek::iosource_mgr->Size() > 0 ||
+	                   zeek::run_state::detail::have_pending_timers ||
+	                   zeek::BifConst::exit_only_after_terminate;
 
-	if ( do_net_run )
+	if ( do_run_loop )
 		{
 		if ( zeek::detail::profiling_logger )
 			zeek::detail::profiling_logger->Log();
@@ -78,5 +78,5 @@ int main(int argc, char** argv)
 			}
 		}
 
-	return zeek::detail::cleanup(do_net_run);
+	return zeek::detail::cleanup(do_run_loop);
 	}
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 42c0abe3cb..26262d85f7 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -908,9 +908,9 @@ SetupResult setup(int argc, char** argv, Options* zopts)
 	return {0, std::move(options)};
 	}
 
-int cleanup(bool did_net_run)
+int cleanup(bool did_run_loop )
 	{
-	if ( did_net_run )
+	if ( did_run_loop )
 		done_with_network();
 
 	run_state::detail::delete_run();
diff --git a/src/zeek-setup.h b/src/zeek-setup.h
index afba00fe19..46ffa90613 100644
--- a/src/zeek-setup.h
+++ b/src/zeek-setup.h
@@ -24,8 +24,8 @@ SetupResult setup(int argc, char** argv, Options* options = nullptr);
 
 /**
  * Cleans up Zeek's global state.
- * @param did_net_run  whether the net_run() was called.
+ * @param did_run_loop  whether the run_loop() function was called.
  */
-int cleanup(bool did_net_run);
+int cleanup(bool did_run_loop);
 
 } // namespace zeek::detail