diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-20 18:16:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-20 18:16:15 +0000 |
| commit | 2ead17196c10f40af35e954dd7b42a2c48304b1e (patch) | |
| tree | 16aee7a08dda2b3dd70a9631e55321da101823d3 /logd | |
| parent | 1fa079b2555a12a53a6d25956d4f371ace60edce (diff) | |
| parent | b545e1c9e3d5989e2e889e65436524fdcfed930e (diff) | |
| download | system_core-2ead17196c10f40af35e954dd7b42a2c48304b1e.tar.gz system_core-2ead17196c10f40af35e954dd7b42a2c48304b1e.tar.bz2 system_core-2ead17196c10f40af35e954dd7b42a2c48304b1e.zip | |
Merge "logd: trailing spaces in log statistics (part deux)"
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/LogStatistics.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h index 613771c8b..7acef6d6c 100644 --- a/logd/LogStatistics.h +++ b/logd/LogStatistics.h @@ -17,11 +17,12 @@ #ifndef _LOGD_LOG_STATISTICS_H__ #define _LOGD_LOG_STATISTICS_H__ -#include <memory> +#include <ctype.h> #include <stdlib.h> #include <sys/types.h> #include <algorithm> // std::max +#include <memory> #include <string> // std::string #include <unordered_map> @@ -211,14 +212,16 @@ struct EntryBase { EntryBaseConstants::total_len - name.length() - drop_len - 1); - if (pruned.length()) { - return android::base::StringPrintf("%s%*s%*s\n", name.c_str(), - (int)size_len, size.c_str(), - (int)drop_len, pruned.c_str()); - } else { - return android::base::StringPrintf("%s%*s\n", name.c_str(), - (int)size_len, size.c_str()); - } + std::string ret = android::base::StringPrintf("%s%*s%*s", + name.c_str(), + (int)size_len, size.c_str(), + (int)drop_len, pruned.c_str()); + // remove any trailing spaces + size_t pos = ret.size(); + size_t len = 0; + while (pos && isspace(ret[--pos])) ++len; + if (len) ret.erase(pos + 1, len); + return ret + "\n"; } }; |