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

Side by Side Diff: ipc/param_traits_log_macros.h

Issue 15841011: Implement off-the-wire validation scheme for enum types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add () around macro parameter. Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « ipc/ipc_message_null_macros.h ('k') | ipc/param_traits_macros.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef IPC_PARAM_TRAITS_LOG_MACROS_H_ 5 #ifndef IPC_PARAM_TRAITS_LOG_MACROS_H_
6 #define IPC_PARAM_TRAITS_LOG_MACROS_H_ 6 #define IPC_PARAM_TRAITS_LOG_MACROS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 // Null out all the macros that need nulling. 10 // Null out all the macros that need nulling.
11 #include "ipc/ipc_message_null_macros.h" 11 #include "ipc/ipc_message_null_macros.h"
12 12
13 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. 13 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur.
14 #undef IPC_STRUCT_BEGIN
15 #undef IPC_STRUCT_BEGIN_WITH_PARENT 14 #undef IPC_STRUCT_BEGIN_WITH_PARENT
16 #undef IPC_STRUCT_MEMBER 15 #undef IPC_STRUCT_MEMBER
17 #undef IPC_STRUCT_END 16 #undef IPC_STRUCT_END
18 #define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ 17 #define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \
19 IPC_STRUCT_BEGIN(struct_name) 18 IPC_STRUCT_TRAITS_BEGIN(struct_name)
20 #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name)
21 #define IPC_STRUCT_MEMBER(type, name, ...) IPC_STRUCT_TRAITS_MEMBER(name) 19 #define IPC_STRUCT_MEMBER(type, name, ...) IPC_STRUCT_TRAITS_MEMBER(name)
22 #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() 20 #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END()
23 21
24 // Set up so next include will generate log methods. 22 // Set up so next include will generate log methods.
25 #undef IPC_STRUCT_TRAITS_BEGIN 23 #undef IPC_STRUCT_TRAITS_BEGIN
26 #undef IPC_STRUCT_TRAITS_MEMBER 24 #undef IPC_STRUCT_TRAITS_MEMBER
27 #undef IPC_STRUCT_TRAITS_PARENT 25 #undef IPC_STRUCT_TRAITS_PARENT
28 #undef IPC_STRUCT_TRAITS_END 26 #undef IPC_STRUCT_TRAITS_END
29 #define IPC_STRUCT_TRAITS_BEGIN(struct_name) \ 27 #define IPC_STRUCT_TRAITS_BEGIN(struct_name) \
30 void ParamTraits<struct_name>::Log(const param_type& p, std::string* l) { \ 28 void ParamTraits<struct_name>::Log(const param_type& p, std::string* l) { \
31 bool needs_comma = false; \ 29 bool needs_comma = false; \
32 l->append("("); 30 l->append("(");
33 #define IPC_STRUCT_TRAITS_MEMBER(name) \ 31 #define IPC_STRUCT_TRAITS_MEMBER(name) \
34 if (needs_comma) \ 32 if (needs_comma) \
35 l->append(", "); \ 33 l->append(", "); \
36 LogParam(p.name, l); \ 34 LogParam(p.name, l); \
37 needs_comma = true; 35 needs_comma = true;
38 #define IPC_STRUCT_TRAITS_PARENT(type) \ 36 #define IPC_STRUCT_TRAITS_PARENT(type) \
39 if (needs_comma) \ 37 if (needs_comma) \
40 l->append(", "); \ 38 l->append(", "); \
41 ParamTraits<type>::Log(p, l); \ 39 ParamTraits<type>::Log(p, l); \
42 needs_comma = true; 40 needs_comma = true;
43 #define IPC_STRUCT_TRAITS_END() \ 41 #define IPC_STRUCT_TRAITS_END() \
44 l->append(")"); \ 42 l->append(")"); \
45 } 43 }
46 44
47 #undef IPC_ENUM_TRAITS 45 #undef IPC_ENUM_TRAITS_VALIDATE
48 #define IPC_ENUM_TRAITS(enum_name) \ 46 #define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \
49 void ParamTraits<enum_name>::Log(const param_type& p, std::string* l) { \ 47 void ParamTraits<enum_name>::Log(const param_type& p, std::string* l) { \
50 LogParam(static_cast<int>(p), l); \ 48 LogParam(static_cast<int>(p), l); \
51 } 49 }
52 50
53 #endif // IPC_PARAM_TRAITS_LOG_MACROS_H_ 51 #endif // IPC_PARAM_TRAITS_LOG_MACROS_H_
54 52
OLDNEW
« no previous file with comments | « ipc/ipc_message_null_macros.h ('k') | ipc/param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698