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

Commit b2cb35ef authored by Dan Austin's avatar Dan Austin Committed by Gerrit Code Review
Browse files

Merge "Address const issues in preparation for libcxx rebase."

parents a2a13e32 b4cff495

adb/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void connect_to_smartsocket(asocket *s); 
namespace internal {



#if ADB_HOST

char* skip_host_serial(const char* service);

char* skip_host_serial(char* service);

#endif



}  // namespace internal

adb/socket_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ TEST_F(LocalSocketTest, close_socket_in_CLOSE_WAIT_state) { 


// Checks that skip_host_serial(serial) returns a pointer to the part of |serial| which matches

// |expected|, otherwise logs the failure to gtest.

void VerifySkipHostSerial(const std::string& serial, const char* expected) {

    const char* result = internal::skip_host_serial(serial.c_str());

void VerifySkipHostSerial(std::string serial, const char* expected) {

    char* result = internal::skip_host_serial(&serial[0]);

    if (expected == nullptr) {

        EXPECT_EQ(nullptr, result);

    } else {

adb/sockets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ namespace internal { 
// Where <port> must be a base-10 number and <prefix> may be any of {usb,product,model,device}.

//

// The returned pointer will point to the ':' just before <command>, or nullptr if not found.

char* skip_host_serial(const char* service) {

char* skip_host_serial(char* service) {

    static const std::vector<std::string>& prefixes =

        *(new std::vector<std::string>{"usb:", "product:", "model:", "device:"});