Merge "init: cleanup exit() uses" am: 9c568d0fc0 (c0fcd21c) · Commits · e / os / android_system_core

init/init.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -569,8 +569,7 @@ int main(int argc, char** argv) {

		epoll_fd = epoll_create1(EPOLL_CLOEXEC);
		if (epoll_fd == -1) {
		PLOG(ERROR) << "epoll_create1 failed";
		exit(1);
		PLOG(FATAL) << "epoll_create1 failed";
		}

		sigchld_handler_init();

+3 −5

Original line number	Diff line number	Diff line
		@@ -73,8 +73,7 @@ static struct selabel_handle* sehandle_prop;

		void property_init() {
		if (__system_property_area_init()) {
		LOG(ERROR) << "Failed to initialize property area";
		exit(1);
		LOG(FATAL) << "Failed to initialize property area";
		}
		}

		@@ -216,7 +215,7 @@ static void PropertyChildLaunch() {
		LOG(ERROR) << "property_set_async(\"" << info.name << "\", \"" << info.value
		<< "\") failed";
		}
		exit(0);
		_exit(0);
		}
		}

		@@ -719,8 +718,7 @@ void start_property_service() {
		property_set_fd = CreateSocket(PROP_SERVICE_NAME, SOCK_STREAM \| SOCK_CLOEXEC \| SOCK_NONBLOCK,
		false, 0666, 0, 0, nullptr);
		if (property_set_fd == -1) {
		PLOG(ERROR) << "start_property_service socket creation failed";
		exit(1);
		PLOG(FATAL) << "start_property_service socket creation failed";
		}

		listen(property_set_fd, 8);

+1 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,7 @@ void sigchld_handler_init() {
		// Create a signalling mechanism for SIGCHLD.
		int s[2];
		if (socketpair(AF_UNIX, SOCK_STREAM \| SOCK_NONBLOCK \| SOCK_CLOEXEC, 0, s) == -1) {
		PLOG(ERROR) << "socketpair failed";
		exit(1);
		PLOG(FATAL) << "socketpair failed in sigchld_handler_init";
		}

		signal_write_fd = s[0];