From 0fd19aa1c8a2bf543099d6b1077ff19078f9074e Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期四, 24 十二月 2020 11:35:12 +0800 Subject: [PATCH] Merge branch 'dev' --- include/usgcommon/usg_common.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/usgcommon/usg_common.h b/include/usgcommon/usg_common.h index 1cf17c4..08d4885 100644 --- a/include/usgcommon/usg_common.h +++ b/include/usgcommon/usg_common.h @@ -98,8 +98,14 @@ char *rtrim(char *str, const char *seps); char *trim(char *str, const char *seps); +/** + * @ seperator 鍒嗗壊绗� + */ char * str_join( const char *seperator, const char *first...); -char ** str_split(const char *str, const char *delim, int *arr_len); +/** + * 鎶婂瓧绗︿覆浠delim鍒嗗壊涓烘暟缁勶紝鏁扮粍鐨勫湴鍧�瀛樻斁鍦ˊarr_addr + */ +int str_split(const char *str, const char *delim, char *** arr_addr); char * array_join(char * const arr[], const char *seperator); char * path_join(const char *path, ...); // 鍙嶅悜鏌ヨ -- Gitblit v1.8.0