Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b332f1c4 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: white and black switch to std::string 

Bug: 23350706
Change-Id: I92f21aee0a9702f63e8465851d0f35007b0469a7
parent c892ea3f

logd/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libsysutils \

    liblog \

    libcutils \

    libutils

    libutils \

    libbase



# This is what we want to do:

#  event_logtags = $(shell \

logd/LogWhiteBlackList.cpp

+8 −6
Original line number Diff line number Diff line
@@ -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 -