X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=c048878cbdc8073a266bed35185fcdbe6db14cba;hp=c208b2d19f381146df11e3322f86a4c34302862a;hb=a0fe013448d188b324c00383cfd91695d9d3d076;hpb=26fe3ab755034ea3be8321ec0af548670f8c3bd8

diff --git a/main.cpp b/main.cpp
index c208b2d..c048878 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,8 +36,8 @@
 
 using namespace std;
 
-AccessLogThread *access_log = NULL;
-ServerPool *servers = NULL;
+AccessLogThread *access_log = nullptr;
+ServerPool *servers = nullptr;
 volatile bool hupped = false;
 volatile bool stopped = false;
 
@@ -116,7 +116,7 @@ vector<Acceptor *> create_acceptors(
 {
 	vector<Acceptor *> acceptors;
 	for (const AcceptorConfig &acceptor_config : config.acceptors) {
-		Acceptor *acceptor = NULL;
+		Acceptor *acceptor = nullptr;
 		const auto deserialized_acceptor_it = deserialized_acceptors->find(acceptor_config);
 		if (deserialized_acceptor_it != deserialized_acceptors->end()) {
 			acceptor = deserialized_acceptor_it->second;
@@ -152,7 +152,7 @@ void create_config_input(const string &src, Input::Encoding encoding, multimap<I
 
 	InputWithRefcount iwr;
 	iwr.input = create_input(src, encoding);
-	if (iwr.input == NULL) {
+	if (iwr.input == nullptr) {
 		log(ERROR, "did not understand URL '%s' or source encoding was invalid, clients will not get any data.",
 			src.c_str());
 		return;
@@ -282,7 +282,7 @@ bool dry_run_config(const string &argv0, const string &config_filename)
 		return false;
 	case 0:
 		// Child.
-		execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL);
+		execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, nullptr);
 		log_perror(argv0_copy);
 		_exit(1);
 	default:
@@ -363,11 +363,11 @@ int main(int argc, char **argv)
 	char argv0_canon[PATH_MAX];
 	char config_filename_canon[PATH_MAX];
 
-	if (realpath("/proc/self/exe", argv0_canon) == NULL) {
+	if (realpath("/proc/self/exe", argv0_canon) == nullptr) {
 		log_perror(argv[0]);
 		exit(1);
 	}
-	if (realpath(config_filename.c_str(), config_filename_canon) == NULL) {
+	if (realpath(config_filename.c_str(), config_filename_canon) == nullptr) {
 		log_perror(config_filename.c_str());
 		exit(1);
 	}
@@ -573,11 +573,11 @@ start:
 	err = clock_gettime(CLOCK_MONOTONIC, &serialize_start);
 	assert(err != -1);
 
-	if (input_stats_thread != NULL) {
+	if (input_stats_thread != nullptr) {
 		input_stats_thread->stop();
 		input_stats_thread.reset();
 	}
-	if (stats_thread != NULL) {
+	if (stats_thread != nullptr) {
 		stats_thread->stop();
 		stats_thread.reset();
 	}
@@ -626,7 +626,7 @@ start:
 	sprintf(buf, "%d", state_fd);
 
 	for ( ;; ) {
-		execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, NULL);
+		execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, nullptr);
 		open_logs(config.log_destinations);
 		log_perror("execlp");
 		log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv0_canon);