summaryrefslogtreecommitdiff
path: root/android/tester-main.h
diff options
context:
space:
mode:
authorMarcin Kraglak <marcin.kraglak@tieto.com>2014-09-02 14:04:24 +0200
committerSzymon Janc <szymon.janc@tieto.com>2014-09-02 17:44:29 +0200
commitaa02db01fe5e43f1eafcc0c1145ba84cbac5bcc5 (patch)
tree53ee778de8db75ad40f165157c09a5761b041ae0 /android/tester-main.h
parentf6a539320c2e775ab4f0403c1c342b764cc06a22 (diff)
downloadbluez-aa02db01fe5e43f1eafcc0c1145ba84cbac5bcc5.tar.gz
android/tester: Simplify ACTION_FAIL and ACTION_SUCCESS defines
Diffstat (limited to 'android/tester-main.h')
-rw-r--r--android/tester-main.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/android/tester-main.h b/android/tester-main.h
index 77f76601f..171dbee1d 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -68,24 +68,18 @@
(struct step[]) {__VA_ARGS__}, \
}
-#define ACTION_SUCCESS(act_fun, data_set) { \
- .action_status = BT_STATUS_SUCCESS, \
- .action = act_fun, \
- .set_data = data_set, \
- }
-
-#define ACTION_FAIL(act_fun, data_set) { \
- .action_status = BT_STATUS_FAIL, \
- .action = act_fun, \
- .set_data = data_set, \
- }
-
#define ACTION(status, act_fun, data_set) { \
.action_status = status, \
.action = act_fun, \
.set_data = data_set, \
}
+#define ACTION_FAIL(act_fun, data_set) \
+ ACTION(BT_STATUS_FAIL, act_fun, data_set)
+
+#define ACTION_SUCCESS(act_fun, data_set) \
+ ACTION(BT_STATUS_SUCCESS, act_fun, data_set)
+
#define CALLBACK(cb) { \
.callback = cb, \
}