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

Commit b62ff770 authored by chenbruce's avatar chenbruce Committed by Automerger Merge Worker
Browse files

Replace StringPrintf() with fmt::format() am: 9b72daa3 am: be2b936a am:... 

Replace StringPrintf() with fmt::format() am: 9b72daa3 am: be2b936a am: 0dbc8236 am: b1c374c3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1802596

Change-Id: I97073a174e40bf67406a424efafc37676ab79c5c
parents 6f54e70f b1c374c3

Dns64Configuration.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 




namespace android {

namespace android {





using android::base::StringPrintf;

using android::net::NetworkDnsEventReported;

using android::net::NetworkDnsEventReported;

using netdutils::DumpWriter;

using netdutils::DumpWriter;

using netdutils::IPAddress;

using netdutils::IPAddress;
@@ -65,7 +64,7 @@ void Dns64Configuration::startPrefixDiscovery(unsigned netId) { 




    // Note that capturing |cfg| in this lambda creates a copy.

    // Note that capturing |cfg| in this lambda creates a copy.

    std::thread discovery_thread([this, cfg, netId] {

    std::thread discovery_thread([this, cfg, netId] {

        setThreadName(StringPrintf("Nat64Pfx_%u", netId).c_str());

        setThreadName(fmt::format("Nat64Pfx_{}", netId));





        // Make a mutable copy rather than mark the whole lambda mutable.

        // Make a mutable copy rather than mark the whole lambda mutable.

        // No particular reason.

        // No particular reason.

DnsProxyListener.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <algorithm>

#include <algorithm>

#include <vector>

#include <vector>





#include <android-base/stringprintf.h>

#include <android/multinetwork.h>  // ResNsendFlags

#include <android/multinetwork.h>  // ResNsendFlags

#include <cutils/misc.h>           // FIRST_APPLICATION_UID

#include <cutils/misc.h>           // FIRST_APPLICATION_UID

#include <cutils/multiuser.h>

#include <cutils/multiuser.h>
@@ -560,7 +559,7 @@ bool getDns64Prefix(unsigned netId, netdutils::IPPrefix* prefix) { 




std::string makeThreadName(unsigned netId, uint32_t uid) {

std::string makeThreadName(unsigned netId, uint32_t uid) {

    // The maximum of netId and app_id are 5-digit numbers.

    // The maximum of netId and app_id are 5-digit numbers.

    return android::base::StringPrintf("Dns_%u_%u", netId, multiuser_get_app_id(uid));

    return fmt::format("Dns_{}_{}", netId, multiuser_get_app_id(uid));

}

}





}  // namespace

}  // namespace

DnsResolverService.cpp

+3 −5
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <vector>

#include <vector>





#include <BinderUtil.h>

#include <BinderUtil.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/strings.h>

#include <android/binder_manager.h>

#include <android/binder_manager.h>

#include <android/binder_process.h>

#include <android/binder_process.h>
@@ -39,7 +38,6 @@ 
using aidl::android::net::ResolverOptionsParcel;

using aidl::android::net::ResolverOptionsParcel;

using aidl::android::net::ResolverParamsParcel;

using aidl::android::net::ResolverParamsParcel;

using android::base::Join;

using android::base::Join;

using android::base::StringPrintf;

using android::netdutils::DumpWriter;

using android::netdutils::DumpWriter;

using android::netdutils::IPPrefix;

using android::netdutils::IPPrefix;
@@ -182,8 +180,8 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num 
        }

        }

    }

    }





    auto err = StringPrintf("UID %d / PID %d does not have any of the following permissions: %s",

    auto err = fmt::format("UID {} / PID {} does not have any of the following permissions: {}",

                            uid, pid, Join(permissions, ',').c_str());

                           uid, pid, Join(permissions, ','));

    return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str()));

    return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str()));

}

}
@@ -197,7 +195,7 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num 
    uid_t uid = AIBinder_getCallingUid();

    uid_t uid = AIBinder_getCallingUid();

    // CAUTION: caCertificate should NOT be used except for internal testing.

    // CAUTION: caCertificate should NOT be used except for internal testing.

    if (resolverParams.caCertificate.size() != 0 && uid != AID_ROOT) {

    if (resolverParams.caCertificate.size() != 0 && uid != AID_ROOT) {

        auto err = StringPrintf("UID %d is not authorized to set a non-empty CA certificate", uid);

        auto err = fmt::format("UID {} is not authorized to set a non-empty CA certificate", uid);

        return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str()));

        return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str()));

    }

    }

DnsStats.cpp

+8 −9
Original line number Original line Diff line number Diff line
@@ -19,12 +19,11 @@ 




#include "DnsStats.h"

#include "DnsStats.h"





#include <android-base/format.h>

#include <android-base/logging.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>





namespace android::net {

namespace android::net {





using base::StringPrintf;

using netdutils::DumpWriter;

using netdutils::DumpWriter;

using netdutils::IPAddress;

using netdutils::IPAddress;

using netdutils::IPSockAddr;

using netdutils::IPSockAddr;
@@ -54,7 +53,7 @@ std::string rcodeToName(int rcode) { 
        case NS_R_NOTZONE: return "NOTZONE";

        case NS_R_NOTZONE: return "NOTZONE";

        case NS_R_INTERNAL_ERROR: return "INTERNAL_ERROR";

        case NS_R_INTERNAL_ERROR: return "INTERNAL_ERROR";

        case NS_R_TIMEOUT: return "TIMEOUT";

        case NS_R_TIMEOUT: return "TIMEOUT";

        default: return StringPrintf("UNKNOWN(%d)", rcode);

        default: return fmt::format("UNKNOWN({})", rcode);

    }

    }

    // clang-format on

    // clang-format on

}

}
@@ -82,18 +81,18 @@ int StatsData::averageLatencyMs() const { 
}

}





std::string StatsData::toString() const {

std::string StatsData::toString() const {

    if (total == 0) return StringPrintf("%s <no data>", sockAddr.ip().toString().c_str());

    if (total == 0) return fmt::format("{} <no data>", sockAddr.ip().toString());





    const auto now = std::chrono::steady_clock::now();

    const auto now = std::chrono::steady_clock::now();

    const int lastUpdateSec = duration_cast<seconds>(now - lastUpdate).count();

    const int lastUpdateSec = duration_cast<seconds>(now - lastUpdate).count();

    std::string buf;

    std::string buf;

    for (const auto& [rcode, counts] : rcodeCounts) {

    for (const auto& [rcode, counts] : rcodeCounts) {

        if (counts != 0) {

        if (counts != 0) {

            buf += StringPrintf("%s:%d ", rcodeToName(rcode).c_str(), counts);

            buf += fmt::format("{}:{} ", rcodeToName(rcode), counts);

        }

        }

    }

    }

    return StringPrintf("%s (%d, %dms, [%s], %ds)", sockAddr.ip().toString().c_str(), total,

    return fmt::format("{} ({}, {}ms, [{}], {}s)", sockAddr.ip().toString(), total,

                        averageLatencyMs(), buf.c_str(), lastUpdateSec);

                       averageLatencyMs(), buf, lastUpdateSec);

}

}





StatsRecords::StatsRecords(const IPSockAddr& ipSockAddr, size_t size)

StatsRecords::StatsRecords(const IPSockAddr& ipSockAddr, size_t size)
@@ -273,8 +272,8 @@ void DnsStats::dump(DumpWriter& dw) { 
        }

        }

        for (const auto& [_, statsRecords] : statsMap) {

        for (const auto& [_, statsRecords] : statsMap) {

            const StatsData& data = statsRecords.getStatsData();

            const StatsData& data = statsRecords.getStatsData();

            std::string str = data.toString();

            std::string str =

            str += StringPrintf(" score{%.1f}", statsRecords.score());

                    fmt::format("{} score{{{:.1f}}}", data.toString(), statsRecords.score());

            dw.println("%s", str.c_str());

            dw.println("%s", str.c_str());

        }

        }

    };

    };

DnsTlsSocket.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "IDnsTlsSocketObserver.h"

#include "IDnsTlsSocketObserver.h"





#include <android-base/logging.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <netdutils/SocketOption.h>

#include <netdutils/SocketOption.h>

#include <netdutils/ThreadUtil.h>

#include <netdutils/ThreadUtil.h>
@@ -45,7 +44,6 @@ 
namespace android {

namespace android {





using android::net::Experiments;

using android::net::Experiments;

using base::StringPrintf;

using netdutils::enableSockopt;

using netdutils::enableSockopt;

using netdutils::enableTcpKeepAlives;

using netdutils::enableTcpKeepAlives;

using netdutils::isOk;

using netdutils::isOk;
@@ -400,7 +398,7 @@ void DnsTlsSocket::loop() { 
    std::deque<std::vector<uint8_t>> q;

    std::deque<std::vector<uint8_t>> q;

    const int timeout_msecs = DnsTlsSocket::kIdleTimeout.count() * 1000;

    const int timeout_msecs = DnsTlsSocket::kIdleTimeout.count() * 1000;





    setThreadName(StringPrintf("TlsListen_%u", mMark & 0xffff).c_str());

    setThreadName(fmt::format("TlsListen_{}", mMark & 0xffff));





    if (mAsyncHandshake) {

    if (mAsyncHandshake) {

        if (Status status = tcpConnect(); !status.ok()) {

        if (Status status = tcpConnect(); !status.ok()) {