From aa02db01fe5e43f1eafcc0c1145ba84cbac5bcc5 Mon Sep 17 00:00:00 2001 From: Marcin Kraglak Date: Tue, 2 Sep 2014 14:04:24 +0200 Subject: [PATCH] android/tester: Simplify ACTION_FAIL and ACTION_SUCCESS defines --- android/tester-main.h | 18 ++++++------------ 1 file 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, \ } -- 2.47.3