diff options
author | Ningyuan Wang | 2016-11-30 17:20:04 -0600 |
---|---|---|
committer | Ningyuan Wang | 2016-12-01 13:09:40 -0600 |
commit | fa1a494f560f57c1a0f4c3028c04d6be78b0c7bc (patch) | |
tree | e46b8db6ec45edced3708fa0ac25edbe3cc3d7c4 | |
parent | c2b0dce5c32b4e6baf5d923b604529ea0ed97c5f (diff) | |
download | system-connectivity-wificond-fa1a494f560f57c1a0f4c3028c04d6be78b0c7bc.tar.gz system-connectivity-wificond-fa1a494f560f57c1a0f4c3028c04d6be78b0c7bc.tar.xz system-connectivity-wificond-fa1a494f560f57c1a0f4c3028c04d6be78b0c7bc.zip |
Create parcelable_utils.h for helper macros
This creates a new file parceable_utils.h for helper macros used in
C++ binder parcelable classes.
Currently this only includes macro RETURN_IF_FAILED.
Bug: None
Change-Id: I02b1e7feecb9c3879961f1bf6ac50458332c1a91
Test: compile, unit tests
-rw-r--r-- | parcelable_utils.h | 39 | ||||
-rw-r--r-- | scanning/scan_result.cpp | 12 |
2 files changed, 41 insertions, 10 deletions
diff --git a/parcelable_utils.h b/parcelable_utils.h new file mode 100644 index 0000000..d3ac566 --- /dev/null +++ b/parcelable_utils.h | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2016 The Android Open Source Project | ||
3 | * | ||
4 | * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | * you may not use this file except in compliance with the License. | ||
6 | * You may obtain a copy of the License at | ||
7 | * | ||
8 | * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | * | ||
10 | * Unless required by applicable law or agreed to in writing, software | ||
11 | * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | * See the License for the specific language governing permissions and | ||
14 | * limitations under the License. | ||
15 | */ | ||
16 | |||
17 | #ifndef WIFICOND_PARCELABLE_UTILS_H_ | ||
18 | #define WIFICOND_PARCELABLE_UTILS_H_ | ||
19 | |||
20 | namespace android { | ||
21 | namespace wificond { | ||
22 | namespace parcelable_utils { | ||
23 | |||
24 | #define RETURN_IF_FAILED(expression_to_evaluate) \ | ||
25 | { \ | ||
26 | status_t return_status = expression_to_evaluate; \ | ||
27 | if (return_status) { \ | ||
28 | LOG(ERROR) << "Failed to parse binder parcelable object at " \ | ||
29 | << __FILE__ << ":" << __LINE__; \ | ||
30 | return return_status; \ | ||
31 | } \ | ||
32 | } | ||
33 | |||
34 | |||
35 | } // namespace parcelable_utils | ||
36 | } // namespace wificond | ||
37 | } // namespace android | ||
38 | |||
39 | #endif // WIFICOND_PARCELABLE_UTILS_H_ | ||
diff --git a/scanning/scan_result.cpp b/scanning/scan_result.cpp index 8bc6b24..b6080ae 100644 --- a/scanning/scan_result.cpp +++ b/scanning/scan_result.cpp | |||
@@ -21,6 +21,8 @@ | |||
21 | 21 | ||
22 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
23 | 23 | ||
24 | #include "wificond/parcelable_utils.h" | ||
25 | |||
24 | using android::status_t; | 26 | using android::status_t; |
25 | using android::OK; | 27 | using android::OK; |
26 | using std::string; | 28 | using std::string; |
@@ -32,16 +34,6 @@ namespace server { | |||
32 | namespace wifi { | 34 | namespace wifi { |
33 | namespace wificond { | 35 | namespace wificond { |
34 | 36 | ||
35 | #define RETURN_IF_FAILED(calledOnce) \ | ||
36 | { \ | ||
37 | status_t returnStatus = calledOnce; \ | ||
38 | if (returnStatus) { \ | ||
39 | LOG(ERROR) << "Failed to parse binder parcelable object at " \ | ||
40 | << __FILE__ << ":" << __LINE__; \ | ||
41 | return returnStatus; \ | ||
42 | } \ | ||
43 | } | ||
44 | |||
45 | NativeScanResult::NativeScanResult(std::vector<uint8_t>& ssid_, | 37 | NativeScanResult::NativeScanResult(std::vector<uint8_t>& ssid_, |
46 | std::vector<uint8_t>& bssid_, | 38 | std::vector<uint8_t>& bssid_, |
47 | std::vector<uint8_t>& info_element_, | 39 | std::vector<uint8_t>& info_element_, |