summaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-13 17:16:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-13 17:16:30 +0000
commit51c6ad178e723a4cd59a143dd48d81ccdce2d489 (patch)
treed4c5960fe77cbe88d98f8499fed434726907178f /logcat
parenta4be1b72b9b0778274fe70c9c37b9e29f9062eb5 (diff)
parentc9fc3db55b6a54dde740ba558a98835ea6552190 (diff)
downloadsystem_core-51c6ad178e723a4cd59a143dd48d81ccdce2d489.zip
system_core-51c6ad178e723a4cd59a143dd48d81ccdce2d489.tar.gz
system_core-51c6ad178e723a4cd59a143dd48d81ccdce2d489.tar.bz2
am c9fc3db5: am 7746546b: Merge "logcat: build regression"
* commit 'c9fc3db55b6a54dde740ba558a98835ea6552190': logcat: build regression
Diffstat (limited to 'logcat')
-rw-r--r--logcat/logcat.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 5db539f..2b19b93 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -342,12 +342,10 @@ static bool getSizeTArg(char *ptr, size_t *val, size_t min = 0,
static void logcat_panic(bool showHelp, const char *fmt, ...)
{
- if (fmt) {
- va_list args;
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- va_end(args);
- }
+ va_list args;
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
if (showHelp) {
show_help(getprogname());