summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-18 17:10:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-18 17:10:49 +0000
commitf8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec (patch)
tree81d1809254ebd823e7e90f3e21eda7e325c12862
parent80fef2c037b41755f3aa49bf1ff3185cb63afe4c (diff)
parent6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8 (diff)
downloadsystem_core-f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec.zip
system_core-f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec.tar.gz
system_core-f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec.tar.bz2
am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages"
* commit '6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8': logcat: improve error messages
-rw-r--r--logcat/logcat.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 7bf91a9..5960609 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -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);
}