am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages" (f8c9ccf3) · Commits · e / os / android_system_core

logcat/logcat.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -699,7 +699,7 @@ int main(int argc, char **argv)
		int ret;
		ret = android_logger_clear(dev->logger);
		if (ret) {
		perror("clearLog");
		perror("failed to clear the log");
		exit(EXIT_FAILURE);
		}
		}
		@@ -707,7 +707,7 @@ int main(int argc, char **argv)
		#ifdef USERDEBUG_BUILD

		if (setLogSize && android_logger_set_log_size(dev->logger, setLogSize)) {
		perror("setLogSize");
		perror("failed to set the log size");
		exit(EXIT_FAILURE);
		}

		@@ -718,13 +718,13 @@ int main(int argc, char **argv)

		size = android_logger_get_log_size(dev->logger);
		if (size < 0) {
		perror("getLogSize");
		perror("failed to get the log size");
		exit(EXIT_FAILURE);
		}

		readable = android_logger_get_log_readable_size(dev->logger);
		if (readable < 0) {
		perror("getLogReadableSize");
		perror("failed to get the readable log size");
		exit(EXIT_FAILURE);
		}

		@@ -748,7 +748,7 @@ int main(int argc, char **argv)
		free(buf);

		if (ret) {
		perror("setPruneList");
		perror("failed to set the prune list");
		exit(EXIT_FAILURE);
		}
		}
		@@ -792,7 +792,7 @@ int main(int argc, char **argv)
		}

		if (!buf) {
		perror("response read");
		perror("failed to read data");
		exit(EXIT_FAILURE);
		}

		@@ -859,7 +859,7 @@ int main(int argc, char **argv)
		fprintf(stderr, "read: unexpected length.\n");
		exit(EXIT_FAILURE);
		}
		perror("logcat read");
		perror("logcat read failure");
		exit(EXIT_FAILURE);
		}