Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
458faa3d
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
大约 1 年 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
458faa3d
编写于
1月 18, 2023
作者:
O
openharmony_ci
提交者:
Gitee
1月 18, 2023
浏览文件
操作
浏览文件
下载
差异文件
!790 refactor: liteos_m不同C库malloc适配归一
Merge pull request !790 from Zhaotianyu/20230117libc_malloc
上级
f1936b48
0b32eaf5
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
0 addition
and
110 deletion
+0
-110
porting/liteos_m_iccarm/kernel/iccarm.gni
porting/liteos_m_iccarm/kernel/iccarm.gni
+0
-1
porting/liteos_m_iccarm/kernel/src/malloc.c
porting/liteos_m_iccarm/kernel/src/malloc.c
+0
-109
未找到文件。
porting/liteos_m_iccarm/kernel/iccarm.gni
浏览文件 @
458faa3d
...
@@ -31,7 +31,6 @@ MUSLPORTINGDIR = get_path_info(".", "abspath")
...
@@ -31,7 +31,6 @@ MUSLPORTINGDIR = get_path_info(".", "abspath")
ICCARM_ADAPT_INCLUDE_DIRS = [ "$MUSLPORTINGDIR/include" ]
ICCARM_ADAPT_INCLUDE_DIRS = [ "$MUSLPORTINGDIR/include" ]
ICCARM_ADAPT_SRC_COMMON = [
ICCARM_ADAPT_SRC_COMMON = [
"$MUSLPORTINGDIR/src/malloc.c",
"$MUSLPORTINGDIR/src/misc/realpath.c",
"$MUSLPORTINGDIR/src/misc/realpath.c",
"$MUSLPORTINGDIR/src/network/htonl.c",
"$MUSLPORTINGDIR/src/network/htonl.c",
"$MUSLPORTINGDIR/src/network/htons.c",
"$MUSLPORTINGDIR/src/network/htons.c",
...
...
porting/liteos_m_iccarm/kernel/src/malloc.c
已删除
100644 → 0
浏览文件 @
f1936b48
/*
* Copyright (c) 2022-2022 Huawei Device Co., Ltd. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
* to endorse or promote products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdint.h>
#include "securec.h"
#include "los_config.h"
#include "los_memory.h"
#ifdef LOSCFG_LIBC_ICCARM_MALLOC
void
*
calloc
(
size_t
nitems
,
size_t
size
)
{
size_t
real_size
;
void
*
ptr
=
NULL
;
if
((
nitems
==
0
)
||
(
size
==
0
)
||
(
nitems
>
(
UINT32_MAX
/
size
)))
{
return
NULL
;
}
real_size
=
(
size_t
)(
nitems
*
size
);
ptr
=
LOS_MemAlloc
(
OS_SYS_MEM_ADDR
,
real_size
);
if
(
ptr
!=
NULL
)
{
(
void
)
memset_s
(
ptr
,
real_size
,
0
,
real_size
);
}
return
ptr
;
}
void
free
(
void
*
ptr
)
{
if
(
ptr
==
NULL
)
{
return
;
}
LOS_MemFree
(
OS_SYS_MEM_ADDR
,
ptr
);
}
void
*
malloc
(
size_t
size
)
{
if
(
size
==
0
)
{
return
NULL
;
}
return
LOS_MemAlloc
(
OS_SYS_MEM_ADDR
,
size
);
}
void
*
zalloc
(
size_t
size
)
{
void
*
ptr
=
NULL
;
if
(
size
==
0
)
{
return
NULL
;
}
ptr
=
LOS_MemAlloc
(
OS_SYS_MEM_ADDR
,
size
);
if
(
ptr
!=
NULL
)
{
(
void
)
memset_s
(
ptr
,
size
,
0
,
size
);
}
return
ptr
;
}
void
*
memalign
(
size_t
boundary
,
size_t
size
)
{
if
(
size
==
0
)
{
return
NULL
;
}
return
LOS_MemAllocAlign
(
OS_SYS_MEM_ADDR
,
size
,
boundary
);
}
void
*
realloc
(
void
*
ptr
,
size_t
size
)
{
if
(
ptr
==
NULL
)
{
return
malloc
(
size
);
}
if
(
size
==
0
)
{
free
(
ptr
);
return
NULL
;
}
return
LOS_MemRealloc
(
OS_SYS_MEM_ADDR
,
ptr
,
size
);
}
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录