ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logd: white and black switch to std::string"

Browse source
This commit is contained in:
Mark Salyzyn 2015-08-21 16:43:15 +00:00 • committed by Gerrit Code Review
commit cf5bd8ba05
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 \ libsysutils \
liblog \ liblog \
libcutils \ libcutils \
libutils libutils \
libbase
# This is what we want to do: # This is what we want to do:
# event_logtags = $(shell \ # event_logtags = $(shell \

14
logd/LogWhiteBlackList.cpp
View file

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