device/bluetooth/bluetooth_uuid.cc - Issue 2127373006: Use base::StartWith() in more places when appropriate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_uuid.cc

Issue 2127373006: Use base::StartWith() in more places when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build, fix error Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc ('K') | « content/shell/renderer/layout_test/blink_test_runner.cc ('k') | extensions/common/extension_l10n_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_uuid.cc

diff --git a/device/bluetooth/bluetooth_uuid.cc b/device/bluetooth/bluetooth_uuid.cc

index 071493a902b55ac8b0570b190e2ecf1885b1fa0d..b35094deba169ab202a92d118bb5d02027b38c18 100644

--- a/device/bluetooth/bluetooth_uuid.cc

+++ b/device/bluetooth/bluetooth_uuid.cc

@@ -13,8 +13,8 @@ namespace device {

namespace {

-const char* kCommonUuidPostfix = "-0000-1000-8000-00805f9b34fb";

-const char* kCommonUuidPrefix = "0000";

+const char kCommonUuidPostfix[] = "-0000-1000-8000-00805f9b34fb";

+const char kCommonUuidPrefix[] = "0000";

// Returns the canonical, 128-bit canonical, and the format of the UUID

// in |canonical|, |canonical_128|, and |format| based on |uuid|.

@@ -30,8 +30,10 @@ void GetCanonicalUuid(std::string uuid,

if (uuid.empty())

return;

- if (uuid.size() < 11 && uuid.find("0x") == 0)

+ if (uuid.size() < 11 &&

+ base::StartsWith(uuid, "0x", base::CompareCase::SENSITIVE)) {

uuid = uuid.substr(2);

+ }

if (!(uuid.size() == 4 || uuid.size() == 8 || uuid.size() == 36))

return;