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

Side by Side Diff: webrtc/p2p/base/transportdescription.cc

Issue 1405023016: Convert usage of ARRAY_SIZE to arraysize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: static_cast<int> Created 5 years, 1 month 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
« no previous file with comments | « webrtc/p2p/base/stun_unittest.cc ('k') | webrtc/sound/alsasoundsystem.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2013 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/p2p/base/transportdescription.h" 11 #include "webrtc/p2p/base/transportdescription.h"
12 12
13 #include "webrtc/base/arraysize.h"
13 #include "webrtc/base/basicdefs.h" 14 #include "webrtc/base/basicdefs.h"
14 #include "webrtc/base/stringutils.h" 15 #include "webrtc/base/stringutils.h"
15 #include "webrtc/p2p/base/constants.h" 16 #include "webrtc/p2p/base/constants.h"
16 17
17 namespace cricket { 18 namespace cricket {
18 19
19 bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role) { 20 bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role) {
20 const char* const roles[] = { 21 const char* const roles[] = {
21 CONNECTIONROLE_ACTIVE_STR, 22 CONNECTIONROLE_ACTIVE_STR,
22 CONNECTIONROLE_PASSIVE_STR, 23 CONNECTIONROLE_PASSIVE_STR,
23 CONNECTIONROLE_ACTPASS_STR, 24 CONNECTIONROLE_ACTPASS_STR,
24 CONNECTIONROLE_HOLDCONN_STR 25 CONNECTIONROLE_HOLDCONN_STR
25 }; 26 };
26 27
27 for (size_t i = 0; i < ARRAY_SIZE(roles); ++i) { 28 for (size_t i = 0; i < arraysize(roles); ++i) {
28 if (_stricmp(roles[i], role_str.c_str()) == 0) { 29 if (_stricmp(roles[i], role_str.c_str()) == 0) {
29 *role = static_cast<ConnectionRole>(CONNECTIONROLE_ACTIVE + i); 30 *role = static_cast<ConnectionRole>(CONNECTIONROLE_ACTIVE + i);
30 return true; 31 return true;
31 } 32 }
32 } 33 }
33 return false; 34 return false;
34 } 35 }
35 36
36 bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str) { 37 bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str) {
37 switch (role) { 38 switch (role) {
38 case cricket::CONNECTIONROLE_ACTIVE: 39 case cricket::CONNECTIONROLE_ACTIVE:
39 *role_str = cricket::CONNECTIONROLE_ACTIVE_STR; 40 *role_str = cricket::CONNECTIONROLE_ACTIVE_STR;
40 break; 41 break;
41 case cricket::CONNECTIONROLE_ACTPASS: 42 case cricket::CONNECTIONROLE_ACTPASS:
42 *role_str = cricket::CONNECTIONROLE_ACTPASS_STR; 43 *role_str = cricket::CONNECTIONROLE_ACTPASS_STR;
43 break; 44 break;
44 case cricket::CONNECTIONROLE_PASSIVE: 45 case cricket::CONNECTIONROLE_PASSIVE:
45 *role_str = cricket::CONNECTIONROLE_PASSIVE_STR; 46 *role_str = cricket::CONNECTIONROLE_PASSIVE_STR;
46 break; 47 break;
47 case cricket::CONNECTIONROLE_HOLDCONN: 48 case cricket::CONNECTIONROLE_HOLDCONN:
48 *role_str = cricket::CONNECTIONROLE_HOLDCONN_STR; 49 *role_str = cricket::CONNECTIONROLE_HOLDCONN_STR;
49 break; 50 break;
50 default: 51 default:
51 return false; 52 return false;
52 } 53 }
53 return true; 54 return true;
54 } 55 }
55 56
56 } // namespace cricket 57 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stun_unittest.cc ('k') | webrtc/sound/alsasoundsystem.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698