From 58e62832a487b870bd4b3a69fdad98bc9baf90b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=96=AF=E5=AD=90?= <1135492039@qq.com> Date: Thu, 14 Mar 2024 10:03:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 1 + src/CMakeLists.txt | 1 - src/common_base64.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7be4a96..7cac2fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ set(HOME ${CMAKE_CURRENT_SOURCE_DIR}) set(SDK_NAME common) set(COMPILE_LIST FALSE CACHE BOOL "是否编译list相关接口") +add_compile_options("-Wall" "Werror") add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f348302..b499178 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories(../include/) - set(LIB_SHARED "${SDK_NAME}_shared") set(LIB_STATIC "${SDK_NAME}_static") diff --git a/src/common_base64.c b/src/common_base64.c index 6288d19..acd9bff 100644 --- a/src/common_base64.c +++ b/src/common_base64.c @@ -20,6 +20,7 @@ static int global_static_get_decode_number(char decode) { return 0; } } + return -1; } int base64_encode(char out[], int *olen, int osize, char in[], int inlen) { -- Gitee From 36dba3f6dee8b98f5de3a7ae61d7bde342c678ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=96=AF=E5=AD=90?= <1135492039@qq.com> Date: Thu, 14 Mar 2024 11:14:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- src/common_interface.c | 37 +++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cac2fe..1a131af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(HOME ${CMAKE_CURRENT_SOURCE_DIR}) set(SDK_NAME common) set(COMPILE_LIST FALSE CACHE BOOL "是否编译list相关接口") -add_compile_options("-Wall" "Werror") +add_compile_options("-Wall" "-Werror") add_subdirectory(src) diff --git a/src/common_interface.c b/src/common_interface.c index 8a7b903..58bcdc3 100644 --- a/src/common_interface.c +++ b/src/common_interface.c @@ -71,22 +71,13 @@ int common_judge_path(const char *path, int path_len) } /** - * 对数组进行快速排序 + * 快速排序函数 */ -int quick_sort(int *arr, int left, int right){ - if(left == right) { - return COM_OK; - } - if(right - left == 1) { - return COM_OK; - } - if(arr == NULL) { - return COM_BAD_INPUT; +void quick_sort_function(int *arr, int left, int right){ + if(left == right && right - left == 1 && left >= right) { + return ; } - if(left >= right){ - return COM_BAD_INPUT; - } - int l = left; + int l = 0; int r = right; int key = arr[left]; while(l < r){ @@ -101,8 +92,22 @@ int quick_sort(int *arr, int left, int right){ arr[r] = arr[l]; arr[l] = key; } - quick_sort(arr, left, l-1); - quick_sort(arr, l+1, right); + quick_sort_function(arr, left, l-1); + quick_sort_function(arr, l+1, right); +} + +/** + * 调用快速排序并对排序数组完成检验 +*/ +int quick_sort(int *arr, int left, int right){ + if(arr == NULL) { + return COM_BAD_INPUT; + } + if(left >= right){ + return COM_BAD_INPUT; + } + quick_sort_function(arr,left,right); + return COM_OK; } static uint64_t internal_byte_common_trans(uint64_t number, common_byte_type byte_type, int position) { -- Gitee From 960592b4b7d0eec3030a66b75882781db5f69b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=96=AF=E5=AD=90?= <1135492039@qq.com> Date: Thu, 14 Mar 2024 11:16:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common_interface.c b/src/common_interface.c index 58bcdc3..0c67f06 100644 --- a/src/common_interface.c +++ b/src/common_interface.c @@ -97,7 +97,7 @@ void quick_sort_function(int *arr, int left, int right){ } /** - * 调用快速排序并对排序数组完成检验 + * 调用快速排序，返回对应信息 */ int quick_sort(int *arr, int left, int right){ if(arr == NULL) { -- Gitee