Apply clang-format to the rest of the tree
find * | grep "\.[ch]" | xargs clang-format --style=file -i
Test: mma -j32
Change-Id: I6fcc9862bb7bc07c2a367ca58fef2b3cd27a6f05
diff --git a/main/stack_config.cc b/main/stack_config.cc
index 72044df..fefeead 100644
--- a/main/stack_config.cc
+++ b/main/stack_config.cc
@@ -25,26 +25,26 @@
#include "osi/include/future.h"
#include "osi/include/log.h"
-const char *BTSNOOP_LOG_PATH_KEY = "BtSnoopFileName";
-const char *BTSNOOP_TURNED_ON_KEY = "BtSnoopLogOutput";
-const char *BTSNOOP_SHOULD_SAVE_LAST_KEY = "BtSnoopSaveLog";
-const char *TRACE_CONFIG_ENABLED_KEY = "TraceConf";
-const char *PTS_SECURE_ONLY_MODE = "PTS_SecurePairOnly";
-const char *PTS_LE_CONN_UPDATED_DISABLED = "PTS_DisableConnUpdates";
-const char *PTS_DISABLE_SDP_LE_PAIR = "PTS_DisableSDPOnLEPair";
-const char *PTS_SMP_PAIRING_OPTIONS_KEY = "PTS_SmpOptions";
-const char *PTS_SMP_FAILURE_CASE_KEY = "PTS_SmpFailureCase";
+const char* BTSNOOP_LOG_PATH_KEY = "BtSnoopFileName";
+const char* BTSNOOP_TURNED_ON_KEY = "BtSnoopLogOutput";
+const char* BTSNOOP_SHOULD_SAVE_LAST_KEY = "BtSnoopSaveLog";
+const char* TRACE_CONFIG_ENABLED_KEY = "TraceConf";
+const char* PTS_SECURE_ONLY_MODE = "PTS_SecurePairOnly";
+const char* PTS_LE_CONN_UPDATED_DISABLED = "PTS_DisableConnUpdates";
+const char* PTS_DISABLE_SDP_LE_PAIR = "PTS_DisableSDPOnLEPair";
+const char* PTS_SMP_PAIRING_OPTIONS_KEY = "PTS_SmpOptions";
+const char* PTS_SMP_FAILURE_CASE_KEY = "PTS_SmpFailureCase";
-static config_t *config;
+static config_t* config;
// Module lifecycle functions
-static future_t *init() {
+static future_t* init() {
// TODO(armansito): Find a better way than searching by a hardcoded path.
#if defined(OS_GENERIC)
- const char *path = "bt_stack.conf";
+ const char* path = "bt_stack.conf";
#else // !defined(OS_GENERIC)
- const char *path = "/etc/bluetooth/bt_stack.conf";
+ const char* path = "/etc/bluetooth/bt_stack.conf";
#endif // defined(OS_GENERIC)
assert(path != NULL);
@@ -59,79 +59,74 @@
return future_new_immediate(FUTURE_SUCCESS);
}
-static future_t *clean_up() {
+static future_t* clean_up() {
config_free(config);
config = NULL;
return future_new_immediate(FUTURE_SUCCESS);
}
EXPORT_SYMBOL extern const module_t stack_config_module = {
- .name = STACK_CONFIG_MODULE,
- .init = init,
- .start_up = NULL,
- .shut_down = NULL,
- .clean_up = clean_up,
- .dependencies = {
- NULL
- }
-};
+ .name = STACK_CONFIG_MODULE,
+ .init = init,
+ .start_up = NULL,
+ .shut_down = NULL,
+ .clean_up = clean_up,
+ .dependencies = {NULL}};
// Interface functions
-static const char *get_btsnoop_log_path(void) {
+static const char* get_btsnoop_log_path(void) {
return config_get_string(config, CONFIG_DEFAULT_SECTION, BTSNOOP_LOG_PATH_KEY,
- "/data/misc/bluetooth/logs/btsnoop_hci.log");
+ "/data/misc/bluetooth/logs/btsnoop_hci.log");
}
static bool get_btsnoop_turned_on(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, BTSNOOP_TURNED_ON_KEY, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION, BTSNOOP_TURNED_ON_KEY,
+ false);
}
static bool get_btsnoop_should_save_last(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, BTSNOOP_SHOULD_SAVE_LAST_KEY, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION,
+ BTSNOOP_SHOULD_SAVE_LAST_KEY, false);
}
static bool get_trace_config_enabled(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, TRACE_CONFIG_ENABLED_KEY, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION,
+ TRACE_CONFIG_ENABLED_KEY, false);
}
static bool get_pts_secure_only_mode(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, PTS_SECURE_ONLY_MODE, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION, PTS_SECURE_ONLY_MODE,
+ false);
}
static bool get_pts_conn_updates_disabled(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, PTS_LE_CONN_UPDATED_DISABLED, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION,
+ PTS_LE_CONN_UPDATED_DISABLED, false);
}
static bool get_pts_crosskey_sdp_disable(void) {
- return config_get_bool(config, CONFIG_DEFAULT_SECTION, PTS_DISABLE_SDP_LE_PAIR, false);
+ return config_get_bool(config, CONFIG_DEFAULT_SECTION,
+ PTS_DISABLE_SDP_LE_PAIR, false);
}
-static const char *get_pts_smp_options(void) {
- return config_get_string(config, CONFIG_DEFAULT_SECTION, PTS_SMP_PAIRING_OPTIONS_KEY, NULL);
+static const char* get_pts_smp_options(void) {
+ return config_get_string(config, CONFIG_DEFAULT_SECTION,
+ PTS_SMP_PAIRING_OPTIONS_KEY, NULL);
}
static int get_pts_smp_failure_case(void) {
- return config_get_int(config, CONFIG_DEFAULT_SECTION, PTS_SMP_FAILURE_CASE_KEY, 0);
+ return config_get_int(config, CONFIG_DEFAULT_SECTION,
+ PTS_SMP_FAILURE_CASE_KEY, 0);
}
-static config_t *get_all(void) {
- return config;
-}
+static config_t* get_all(void) { return config; }
const stack_config_t interface = {
- get_btsnoop_log_path,
- get_btsnoop_turned_on,
- get_btsnoop_should_save_last,
- get_trace_config_enabled,
- get_pts_secure_only_mode,
- get_pts_conn_updates_disabled,
- get_pts_crosskey_sdp_disable,
- get_pts_smp_options,
- get_pts_smp_failure_case,
- get_all
-};
+ get_btsnoop_log_path, get_btsnoop_turned_on,
+ get_btsnoop_should_save_last, get_trace_config_enabled,
+ get_pts_secure_only_mode, get_pts_conn_updates_disabled,
+ get_pts_crosskey_sdp_disable, get_pts_smp_options,
+ get_pts_smp_failure_case, get_all};
-const stack_config_t *stack_config_get_interface(void) {
- return &interface;
-}
+const stack_config_t* stack_config_get_interface(void) { return &interface; }