Replace a few more NULLs with nullptr

Author: gunnarbeutner

icinga-app/icinga.cpp

@@ -258,7 +258,7 @@ static int Main(void)
 				|| command->GetImpersonationLevel() == ImpersonationLevel::ImpersonateRoot) {
 				TCHAR szPath[MAX_PATH];
 
-				if (GetModuleFileName(NULL, szPath, ARRAYSIZE(szPath))) { 
+				if (GetModuleFileName(nullptr, szPath, ARRAYSIZE(szPath))) {
 					SHELLEXECUTEINFO sei = { sizeof(sei) };
 					sei.lpVerb = _T("runas");
 					sei.lpFile = "cmd.exe";
@@ -434,7 +434,7 @@ static int Main(void)
 
 		if (!command || vm.count("help")) {
 			if (!command)
-				CLICommand::ShowCommands(argc, argv, NULL);
+				CLICommand::ShowCommands(argc, argv, nullptr);
 
 			std::cout << visibleDesc << std::endl
 				<< "Report bugs at <https://github.com/Icinga/icinga2>" << std::endl
@@ -477,7 +477,7 @@ static int Main(void)
 			}
 
 			if (getgid() != gr->gr_gid) {
-				if (!vm.count("reload-internal") && setgroups(0, NULL) < 0) {
+				if (!vm.count("reload-internal") && setgroups(0, nullptr) < 0) {
 					Log(LogCritical, "cli")
 					    << "setgroups() failed with error code " << errno << ", \"" << Utility::FormatErrorNumber(errno) << "\"";
 					Log(LogCritical, "cli")
@@ -567,19 +567,16 @@ static int Main(void)
 #ifdef _WIN32
 static int SetupService(bool install, int argc, char **argv)
 {
-	SC_HANDLE schSCManager = OpenSCManager(
-		NULL,
-		NULL,
-		SC_MANAGER_ALL_ACCESS);
+	SC_HANDLE schSCManager = OpenSCManager(nullptr, nullptr, SC_MANAGER_ALL_ACCESS);
 
-	if (NULL == schSCManager) {
+	if (!schSCManager) {
 		printf("OpenSCManager failed (%d)\n", GetLastError());
 		return 1;
 	}
 
 	TCHAR szPath[MAX_PATH];
 
-	if (!GetModuleFileName(NULL, szPath, MAX_PATH)) {
+	if (!GetModuleFileName(nullptr, szPath, MAX_PATH)) {
 		printf("Cannot install service (%d)\n", GetLastError());
 		return 1;
 	}
@@ -604,7 +601,7 @@ static int SetupService(bool install, int argc, char **argv)
 
 	SC_HANDLE schService = OpenService(schSCManager, "icinga2", SERVICE_ALL_ACCESS);
 
-	if (schService != NULL) {
+	if (schService) {
 		SERVICE_STATUS status;
 		ControlService(schService, SERVICE_CONTROL_STOP, &status);
 
@@ -634,13 +631,13 @@ static int SetupService(bool install, int argc, char **argv)
 			SERVICE_DEMAND_START,
 			SERVICE_ERROR_NORMAL,
 			szArgs.CStr(),
-			NULL,
-			NULL,
-			NULL,
+			nullptr,
+			nullptr,
+			nullptr,
 			scmUser.c_str(),
-			NULL);
+			nullptr);
 
-		if (schService == NULL) {
+		if (!schService) {
 			printf("CreateService failed (%d)\n", GetLastError());
 			CloseServiceHandle(schSCManager);
 			return 1;
@@ -662,7 +659,7 @@ static int SetupService(bool install, int argc, char **argv)
 		printf("Service uninstalled successfully\n");
 	} else {
 		if (!ChangeServiceConfig(schService, SERVICE_NO_CHANGE, SERVICE_AUTO_START,
-			SERVICE_ERROR_NORMAL, szArgs.CStr(), NULL, NULL, NULL, scmUser.c_str(), NULL, NULL)) {
+			SERVICE_ERROR_NORMAL, szArgs.CStr(), nullptr, nullptr, nullptr, scmUser.c_str(), nullptr, nullptr)) {
 			printf("ChangeServiceConfig failed (%d)\n", GetLastError());
 			CloseServiceHandle(schService);
 			CloseServiceHandle(schSCManager);
@@ -677,7 +674,7 @@ static int SetupService(bool install, int argc, char **argv)
 			return 1;
 		}
 
-		if (!StartService(schService, 0, NULL)) {
+		if (!StartService(schService, 0, nullptr)) {
 			printf("StartService failed (%d)\n", GetLastError());
 			CloseServiceHandle(schService);
 			CloseServiceHandle(schSCManager);
@@ -743,7 +740,7 @@ static VOID WINAPI ServiceMain(DWORD argc, LPSTR *argv)
 	l_SvcStatus.dwServiceSpecificExitCode = 0;
 
 	ReportSvcStatus(SERVICE_RUNNING, NO_ERROR, 0);
-	l_Job = CreateJobObject(NULL, NULL);
+	l_Job = CreateJobObject(nullptr, nullptr);
 
 	for (;;) {
 		LPSTR arg = argv[0];
@@ -765,7 +762,7 @@ static VOID WINAPI ServiceMain(DWORD argc, LPSTR *argv)
 
 		char *uargs = strdup(args.CStr());
 
-		BOOL res = CreateProcess(NULL, uargs, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+		BOOL res = CreateProcess(nullptr, uargs, nullptr, nullptr, FALSE, 0, nullptr, nullptr, &si, &pi);
 
 		free(uargs);
 
@@ -847,7 +844,7 @@ int main(int argc, char **argv)
 	if (argc > 1 && strcmp(argv[1], "--scm") == 0) {
 		SERVICE_TABLE_ENTRY dispatchTable[] = {
 			{ "icinga2", ServiceMain },
-			{ NULL, NULL }
+			{ nullptr, nullptr }
 		};
 
 		StartServiceCtrlDispatcher(dispatchTable);

icinga-installer/icinga-installer.cpp

@@ -31,7 +31,7 @@
 static std::string GetIcingaInstallPath(void)
 {
 	char szFileName[MAX_PATH];
-	if (!GetModuleFileName(NULL, szFileName, sizeof(szFileName)))
+	if (!GetModuleFileName(nullptr, szFileName, sizeof(szFileName)))
 		return "";
 
 	if (!PathRemoveFileSpec(szFileName))
@@ -100,7 +100,7 @@ static bool PathExists(const std::string& path)
 static std::string GetIcingaDataPath(void)
 {
 	char path[MAX_PATH];
-	if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL, 0, path)))
+	if (!SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_COMMON_APPDATA, nullptr, 0, path)))
 		throw std::runtime_error("SHGetFolderPath failed");
 	return std::string(path) + "\\icinga2";
 }
@@ -133,7 +133,7 @@ static std::string GetNSISInstallPath(void)
 		BYTE pvData[MAX_PATH];
 		DWORD cbData = sizeof(pvData) - 1;
 		DWORD lType;
-		if (RegQueryValueEx(hKey, NULL, NULL, &lType, pvData, &cbData) == ERROR_SUCCESS && lType == REG_SZ) {
+		if (RegQueryValueEx(hKey, nullptr, nullptr, &lType, pvData, &cbData) == ERROR_SUCCESS && lType == REG_SZ) {
 			pvData[cbData] = '\0';
 
 			return (char *)pvData;
@@ -279,7 +279,7 @@ static int UninstallIcinga(void)
 */
 int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
-	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+	CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
 
 	//AllocConsole();
 	int rc;
@@ -291,7 +291,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	} else if (strcmp(lpCmdLine, "upgrade-nsis") == 0) {
 		rc = UpgradeNSIS();
 	} else {
-		MessageBox(NULL, "This application should only be run by the MSI installer package.", "Icinga 2 Installer", MB_ICONWARNING);
+		MessageBox(nullptr, "This application should only be run by the MSI installer package.", "Icinga 2 Installer", MB_ICONWARNING);
 		rc = 1;
 	}
 

icinga-studio/icinga-studio.cpp

@@ -44,7 +44,7 @@ class IcingaStudio : public wxApp
 
 			std::string url = wUrl.ToStdString();
 
-			ConnectForm f(NULL, new Url(url));
+			ConnectForm f(nullptr, new Url(url));
 			if (f.ShowModal() != wxID_OK)
 				return false;
 
@@ -56,7 +56,7 @@ class IcingaStudio : public wxApp
 			pUrl = new Url(argv[1].ToStdString());
 		}
 
-		MainForm *m = new MainForm(NULL, pUrl);
+		MainForm *m = new MainForm(nullptr, pUrl);
 		m->Show();
 
 		return true;