From 2dbc2668169e3aa0920615f3d9078a904827ee25 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 26 Jan 2017 12:16:30 -0700 Subject: repo: Clang-format c/cpp/h LVL files using LLVM Bring all source files in the repo up to date with consistent coding style/standard. Change-Id: Iceedbc17109974d3a0437fc4995441c9ad7e0c23 --- common/android_util.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'common/android_util.cpp') diff --git a/common/android_util.cpp b/common/android_util.cpp index c2c46169..772df06d 100644 --- a/common/android_util.cpp +++ b/common/android_util.cpp @@ -27,8 +27,7 @@ extern "C" { // Convert Intents to arg list, returning argc and argv // Note that this C routine mallocs memory that the caller must free -char** get_args(struct android_app* app, const char* intent_extra_data_key, const char* appTag, int* count) -{ +char **get_args(struct android_app *app, const char *intent_extra_data_key, const char *appTag, int *count) { std::vector args; JavaVM &vm = *app->activity->vm; JNIEnv *p_env; @@ -37,15 +36,13 @@ char** get_args(struct android_app* app, const char* intent_extra_data_key, cons JNIEnv &env = *p_env; jobject activity = app->activity->clazz; - jmethodID get_intent_method = env.GetMethodID(env.GetObjectClass(activity), - "getIntent", "()Landroid/content/Intent;"); + jmethodID get_intent_method = env.GetMethodID(env.GetObjectClass(activity), "getIntent", "()Landroid/content/Intent;"); jobject intent = env.CallObjectMethod(activity, get_intent_method); - jmethodID get_string_extra_method = env.GetMethodID(env.GetObjectClass(intent), - "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;"); + jmethodID get_string_extra_method = + env.GetMethodID(env.GetObjectClass(intent), "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;"); jvalue get_string_extra_args; get_string_extra_args.l = env.NewStringUTF(intent_extra_data_key); - jstring extra_str = static_cast(env.CallObjectMethodA(intent, - get_string_extra_method, &get_string_extra_args)); + jstring extra_str = static_cast(env.CallObjectMethodA(intent, get_string_extra_method, &get_string_extra_args)); std::string args_str; if (extra_str) { @@ -70,14 +67,14 @@ char** get_args(struct android_app* app, const char* intent_extra_data_key, cons // Convert our STL results to C friendly constructs assert(count != nullptr); *count = args.size() + 1; - char** vector = (char**) malloc(*count * sizeof(char*)); - const char* appName = appTag ? appTag : (const char*) "appTag"; + char **vector = (char **)malloc(*count * sizeof(char *)); + const char *appName = appTag ? appTag : (const char *)"appTag"; - vector[0] = (char*) malloc(strlen(appName) * sizeof(char)); - strcpy(vector[0], appName); + vector[0] = (char *)malloc(strlen(appName) * sizeof(char)); + strcpy(vector[0], appName); for (uint32_t i = 0; i < args.size(); i++) { - vector[i + 1] = (char*) malloc(strlen(args[i].c_str()) * sizeof(char)); + vector[i + 1] = (char *)malloc(strlen(args[i].c_str()) * sizeof(char)); strcpy(vector[i + 1], args[i].c_str()); } -- cgit v1.2.3