From eafeb4712655182434a6b0e831f0a8c0b2489ed5 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 6 May 2020 13:38:51 +0200 Subject: [PATCH] make style --- client/android/jni_tools.c | 2 +- client/android/jni_tools.h | 2 +- client/android/pm3_main.c | 20 ++++++++++---------- client/src/cmdhfmfp.c | 4 ++-- client/src/uart/uart_posix.c | 2 +- common/crc32.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/android/jni_tools.c b/client/android/jni_tools.c index 74e05051c..1a5fc9592 100644 --- a/client/android/jni_tools.c +++ b/client/android/jni_tools.c @@ -94,4 +94,4 @@ void free_command_line(CMD *cmd) { free(cmd->cmd); LOGD("释放结构体内存"); free(cmd); -} \ No newline at end of file +} diff --git a/client/android/jni_tools.h b/client/android/jni_tools.h index 121cf043f..3d76184b9 100644 --- a/client/android/jni_tools.h +++ b/client/android/jni_tools.h @@ -37,4 +37,4 @@ CMD *parse_command_line(const char *commandStr); //解析结果释放函数! void free_command_line(CMD *); -#endif //DXL_TOOLS_H \ No newline at end of file +#endif //DXL_TOOLS_H diff --git a/client/android/pm3_main.c b/client/android/pm3_main.c index d9c2386c8..87c6bbd44 100644 --- a/client/android/pm3_main.c +++ b/client/android/pm3_main.c @@ -95,7 +95,7 @@ jint sendCMD(JNIEnv *env, jobject instance, jstring cmd_) { } //无论如何,新的命令的输入了,就要换个行! PrintAndLogEx(NORMAL, "\n"); - char *cmd = (char *) ((*env)->GetStringUTFChars(env, cmd_, 0)); + char *cmd = (char *)((*env)->GetStringUTFChars(env, cmd_, 0)); // Many parts of the PM3 client will assume that they can read any write from pwd. So we set // pwd to whatever the PM3 "executable directory" is, to get consistent behaviour. /*int ret = chdir(get_my_executable_directory()); @@ -120,7 +120,7 @@ jint sendCMD(JNIEnv *env, jobject instance, jstring cmd_) { * 是否在执行命令 * */ jboolean isExecuting(JNIEnv *env, jobject instance) { - return (jboolean) ((jboolean) conn.run); + return (jboolean)((jboolean) conn.run); } /* @@ -133,7 +133,7 @@ jboolean testPm3(JNIEnv *env, jobject instance) { return false; } bool ret2 = TestProxmark() == PM3_SUCCESS; - return (jboolean) (ret1 && ret2); + return (jboolean)(ret1 && ret2); } void stopPm3(JNIEnv *env, jobject instance) { @@ -152,21 +152,21 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { } jclass clz_test = (*jniEnv)->FindClass(jniEnv, "cn/rrg/devices/Proxmark3RRGRdv4"); JNINativeMethod methods[] = { - {"startExecute", "(Ljava/lang/String;)I", (void *) sendCMD}, - {"stopExecute", "()V", (void *) stopPm3}, - {"isExecuting", "()Z", (void *) isExecuting} + {"startExecute", "(Ljava/lang/String;)I", (void *) sendCMD}, + {"stopExecute", "()V", (void *) stopPm3}, + {"isExecuting", "()Z", (void *) isExecuting} }; JNINativeMethod methods1[] = { - {"testPm3", "()Z", (void *) testPm3}, - {"closePm3", "()V", stopPm3} + {"testPm3", "()Z", (void *) testPm3}, + {"closePm3", "()V", stopPm3} }; if ((*jniEnv)->RegisterNatives(jniEnv, clazz, methods, sizeof(methods) / sizeof(methods[0])) != - JNI_OK) { + JNI_OK) { return -1; } if ((*jniEnv)->RegisterNatives(jniEnv, clz_test, methods1, sizeof(methods1) / sizeof(methods1[0])) != - JNI_OK) { + JNI_OK) { return -1; } (*jniEnv)->DeleteLocalRef(jniEnv, clazz); diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index f9d2e661a..bc6854b26 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -950,8 +950,8 @@ static int CmdHFMFPWrbl(const char *Cmd) { #define MAX_KEYS_LIST_LEN 1024 static int MFPKeyCheck(uint8_t startSector, uint8_t endSector, uint8_t startKeyAB, uint8_t endKeyAB, - uint8_t keyList[MAX_KEYS_LIST_LEN][AES_KEY_LEN], size_t keyListLen, uint8_t foundKeys[2][64][AES_KEY_LEN + 1], - bool verbose) { + uint8_t keyList[MAX_KEYS_LIST_LEN][AES_KEY_LEN], size_t keyListLen, uint8_t foundKeys[2][64][AES_KEY_LEN + 1], + bool verbose) { int res; bool selectCard = true; uint8_t keyn[2] = {0}; diff --git a/client/src/uart/uart_posix.c b/client/src/uart/uart_posix.c index 076c02ddf..a846b0d78 100644 --- a/client/src/uart/uart_posix.c +++ b/client/src/uart/uart_posix.c @@ -184,7 +184,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { } if (memcmp(prefix, "bt:", 3) == 0) { - free(prefix); + free(prefix); #ifdef HAVE_BLUEZ if (strlen(pcPortName) != 20) { diff --git a/common/crc32.c b/common/crc32.c index b539baa05..baf6ddd28 100644 --- a/common/crc32.c +++ b/common/crc32.c @@ -24,7 +24,7 @@ void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) { crc32_byte(&desfire_crc, data[i]); } uint32_t crctmp = htole32(desfire_crc); - for (size_t i=0; i < sizeof(uint32_t); i++) { + for (size_t i = 0; i < sizeof(uint32_t); i++) { crc[i] = ((uint8_t *) &crctmp)[i]; } }