Merge pull request #67 from zzq996/master

Version 3.24.12

CMakeLists.txt

@@ -17,21 +17,21 @@ add_definitions(-DMY_PID=196)
 add_definitions(-D__DPAX_LINUX_USR__)
 add_definitions(-D__DPAX_THREAD_NOPREEMPT__)
 
-set(LIBOBS_VER_MAJOR "3.23")
-set(LIBOBS_VER_MINOR "9")
+set(LIBOBS_VER_MAJOR "3.24")
+set(LIBOBS_VER_MINOR "3")
 if(NOT CMAKE_HOST_WIN32)
     add_definitions(-DLIBOBS_VER_MAJOR="${LIBOBS_VER_MAJOR}")
     add_definitions(-DLIBOBS_VER_MINOR="${LIBOBS_VER_MINOR}")
 endif()
 
 option(USE_CUSTOM "option for custom library path" OFF)
-set(SECUREC_INC_DIR ${PROJECT_SOURCE_DIR}/platform/huaweisecurec/include)
-set(CURL_VERSION curl-7.78.0)
-set(OPENSSL_VERSION openssl-1.1.1k)
+set(SECUREC_INC_DIR ${PROJECT_SOURCE_DIR}/platform/libboundscheck/include)
+set(CURL_VERSION curl-8.11.1)
+set(OPENSSL_VERSION openssl-1.1.1w)
 set(LIBXML2_VERSION libxml2-2.9.9)
 set(PCRE_VERSION pcre-8.45)
 set(ICONV_VERSION iconv-1.15)
-set(CJSON_VERSION cjson-1.7.15)
+set(CJSON_VERSION cjson-1.7.18)
 
 
 
@@ -42,12 +42,12 @@ execute_process(COMMAND uname -m OUTPUT_VARIABLE OARCH)
         set(ESDK_LOG_INC_DIR ${PROJECT_SOURCE_DIR}/platform/eSDK_LogAPI_V2.1.10)
         set(ESDK_LOG_LIB_DIR ${PROJECT_SOURCE_DIR}/platform/eSDK_LogAPI_V2.1.10/C/aarch64)
         set(LINKARCH "arm")
-        #execute_process(COMMAND make -f  ${PROJECT_SOURCE_DIR}/platform/huaweisecurec/src/Makefile.aarch64)
+        #execute_process(COMMAND make -f  ${PROJECT_SOURCE_DIR}/platform/libboundscheck/src/Makefile.aarch64)
     elseif(${ARCH} STREQUAL "x86_64")
         set(ESDK_LOG_INC_DIR ${PROJECT_SOURCE_DIR}/platform/eSDK_LogAPI_V2.1.10)
         set(ESDK_LOG_LIB_DIR ${PROJECT_SOURCE_DIR}/platform/eSDK_LogAPI_V2.1.10/C/linux_64)
         set(LINKARCH "linux")
-        #execute_process(COMMAND make -f  ${PROJECT_SOURCE_DIR}/platform/huaweisecurec/src/Makefile)
+        #execute_process(COMMAND make -f  ${PROJECT_SOURCE_DIR}/platform/libboundscheck/src/Makefile)
     endif()
 
     if(NOT USE_CUSTOM)
@@ -65,7 +65,7 @@ execute_process(COMMAND uname -m OUTPUT_VARIABLE OARCH)
         set(CJSON_LIB_DIR ${PROJECT_SOURCE_DIR}/build/script/Provider/build/${LINKARCH}/${CJSON_VERSION}/lib)
         set(SPDLOG_INC_DIR ${PROJECT_SOURCE_DIR}/build/script/Provider/build/${LINKARCH}/${SPDLOG_VERSION}/include)
         set(SPDLOG_LIB_DIR ${PROJECT_SOURCE_DIR}/build/script/Provider/build/${LINKARCH}/${SPDLOG_VERSION}/lib)
-	set(SECUREC_LIB_DIR ${PROJECT_SOURCE_DIR}/platform/huaweisecurec/lib/${LINKARCH})
+	set(SECUREC_LIB_DIR ${PROJECT_SOURCE_DIR}/platform/libboundscheck/lib/${LINKARCH})
     else()
         if(NOT DEFINED CURL_INC_DIR)
             set(CURL_INC_DIR "/usr/include" CACHE STRING "")
@@ -205,7 +205,7 @@ aux_source_directory(${CMAKE_SOURCE_DIR}/source/eSDK_OBS_API/eSDK_OBS_API_C++/sr
 aux_source_directory(${CMAKE_SOURCE_DIR}/source/eSDK_OBS_API/eSDK_OBS_API_C++/src/bucket BUCKET_SOURCE_DIR)
 aux_source_directory(${CMAKE_SOURCE_DIR}/source/eSDK_OBS_API/eSDK_OBS_API_C++/src/object OBJECT_SOURCE_DIR)
 add_library(eSDKOBS SHARED ${SOURCE_DIR} ${BUCKET_SOURCE_DIR} ${OBJECT_SOURCE_DIR})
-target_link_libraries(eSDKOBS curl ssl xml2 pcre iconv cjson securec eSDKLogAPI spdlog)
+target_link_libraries(eSDKOBS curl ssl xml2 pcre iconv cjson boundscheck eSDKLogAPI spdlog)
 
 #***********************************************************************
 #*

README.md

@@ -1,5 +1,13 @@
 huaweicloud-sdk-c-obs
 ----------------------------------------------------
+Version 3.24.12
+新特性：
+1.支持并行文件系统回收站特性
+2.支持获取桶元数据中的桶类型
+修复问题：
+1、优化断点续传上传、下载时的部分逻辑
+2、修复部分变量未正确初始化的问题
+----------------------------------------------------
 Version 3.24.3
 新特性：
 1.支持通过自定义域名访问

build/script/Provider/build/arm/cjson-1.7.15/include/cJSON.h → build/script/Provider/build/arm/cjson-1.7.18/include/cJSON.h

@@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
 /* project version */
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MINOR 7
-#define CJSON_VERSION_PATCH 15
+#define CJSON_VERSION_PATCH 18
 
 #include <stddef.h>
 
@@ -279,6 +279,13 @@ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
 /* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
 CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
 
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
 /* Macro for iterating over an array or object */
 #define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)