openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string" 

* commit 'aa051ac68d769194751624612bf68cb753d94b6d':
  logd: white and black switch to std::string
This commit is contained in:
Mark Salyzyn 2015-08-21 18:19:43 +00:00 committed by Android Git Automerger
parent 8b9da2d41a aa051ac68d
commit 36a590ab36
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logd/Android.mk
View File

@ -25,7 +25,8 @@ LOCAL_SHARED_LIBRARIES := \
libsysutils \
liblog \
libcutils \
libutils
libutils \
libbase
# This is what we want to do:
# event_logtags = $(shell \

14
logd/LogWhiteBlackList.cpp
View File

@ -16,7 +16,9 @@
#include <ctype.h>
#include <utils/String8.h>
#include <string>
#include <base/stringprintf.h>
#include "LogWhiteBlackList.h"
@ -176,10 +178,10 @@ void PruneList::format(char **strp) {
static const char nice_format[] = " %s";
const char *fmt = nice_format + 1;
android::String8 string;
std::string string;
if (mWorstUidEnabled) {
string.setTo("~!");
string = "~!";
fmt = nice_format;
}
@ -189,7 +191,7 @@ void PruneList::format(char **strp) {
char *a = NULL;
(*it).format(&a);
string.appendFormat(fmt, a);
string += android::base::StringPrintf(fmt, a);
fmt = nice_format;
free(a);
@ -201,13 +203,13 @@ void PruneList::format(char **strp) {
char *a = NULL;
(*it).format(&a);
string.appendFormat(fmt, a);
string += android::base::StringPrintf(fmt, a);
fmt = naughty_format;
free(a);
}
*strp = strdup(string.string());
*strp = strdup(string.c_str());
}
// ToDo: Lists are in sorted order, Prune->cmp() returns + or -