Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1157)

Side by Side Diff: dbus/string_util.cc

Issue 1233043003: Remove some legacy versions of StartsWith and EndsWith. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "dbus/string_util.h" 5 #include "dbus/string_util.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 8
9 namespace dbus { 9 namespace dbus {
10 10
11 // This implementation is based upon D-Bus Specification Version 0.19.
11 bool IsValidObjectPath(const std::string& value) { 12 bool IsValidObjectPath(const std::string& value) {
12 // This implementation is based upon D-Bus Specification Version 0.19.
13
14 const bool kCaseSensitive = true;
15
16 // A valid object path begins with '/'. 13 // A valid object path begins with '/'.
17 if (!base::StartsWithASCII(value, "/", kCaseSensitive)) 14 if (!base::StartsWith(value, "/", base::CompareCase::SENSITIVE))
18 return false; 15 return false;
19 16
20 // Elements are pieces delimited by '/'. For instance, "org", "chromium", 17 // Elements are pieces delimited by '/'. For instance, "org", "chromium",
21 // "Foo" are elements of "/org/chromium/Foo". 18 // "Foo" are elements of "/org/chromium/Foo".
22 int element_length = 0; 19 int element_length = 0;
23 for (size_t i = 1; i < value.size(); ++i) { 20 for (size_t i = 1; i < value.size(); ++i) {
24 const char c = value[i]; 21 const char c = value[i];
25 if (c == '/') { 22 if (c == '/') {
26 // No element may be the empty string. 23 // No element may be the empty string.
27 if (element_length == 0) 24 if (element_length == 0)
28 return false; 25 return false;
29 element_length = 0; 26 element_length = 0;
30 } else { 27 } else {
31 // Each element must only contain "[A-Z][a-z][0-9]_". 28 // Each element must only contain "[A-Z][a-z][0-9]_".
32 const bool is_valid_character = 29 const bool is_valid_character =
33 ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || 30 ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') ||
34 ('0' <= c && c <= '9') || c == '_'; 31 ('0' <= c && c <= '9') || c == '_';
35 if (!is_valid_character) 32 if (!is_valid_character)
36 return false; 33 return false;
37 element_length++; 34 element_length++;
38 } 35 }
39 } 36 }
40 37
41 // A trailing '/' character is not allowed unless the path is the root path. 38 // A trailing '/' character is not allowed unless the path is the root path.
42 if (value.size() > 1 && base::EndsWith(value, "/", kCaseSensitive)) 39 if (value.size() > 1 &&
40 base::EndsWith(value, "/", base::CompareCase::SENSITIVE))
43 return false; 41 return false;
44 42
45 return true; 43 return true;
46 } 44 }
47 45
48 } // namespace dbus 46 } // namespace dbus
OLDNEW
« no previous file with comments | « content/common/set_process_title.cc ('k') | extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698