Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Unity
提交
bdd4cb19
T
Third Party Unity
项目概览
OpenHarmony
/
Third Party Unity
1 年多 前同步成功
通知
36
Star
144
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Unity
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
bdd4cb19
编写于
9月 11, 2017
作者:
M
Mark VanderVoord
提交者:
GitHub
9月 11, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #294 from jlindgren90/master
Fix compiler warning due to reusing symbol 'exp'.
上级
05daf95d
fcd4883c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
8 addition
and
8 deletion
+8
-8
src/unity.c
src/unity.c
+8
-8
未找到文件。
src/unity.c
浏览文件 @
bdd4cb19
...
@@ -1073,7 +1073,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
...
@@ -1073,7 +1073,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
{
{
UNITY_UINT32
i
=
0
;
UNITY_UINT32
i
=
0
;
UNITY_UINT32
j
=
0
;
UNITY_UINT32
j
=
0
;
const
char
*
exp
=
NULL
;
const
char
*
exp
d
=
NULL
;
const
char
*
act
=
NULL
;
const
char
*
act
=
NULL
;
RETURN_IF_FAIL_OR_IGNORE
;
RETURN_IF_FAIL_OR_IGNORE
;
...
@@ -1096,7 +1096,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
...
@@ -1096,7 +1096,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
if
(
flags
!=
UNITY_ARRAY_TO_ARRAY
)
if
(
flags
!=
UNITY_ARRAY_TO_ARRAY
)
{
{
exp
=
(
const
char
*
)
expected
;
exp
d
=
(
const
char
*
)
expected
;
}
}
do
do
...
@@ -1104,15 +1104,15 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
...
@@ -1104,15 +1104,15 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
act
=
actual
[
j
];
act
=
actual
[
j
];
if
(
flags
==
UNITY_ARRAY_TO_ARRAY
)
if
(
flags
==
UNITY_ARRAY_TO_ARRAY
)
{
{
exp
=
((
const
char
*
const
*
)
expected
)[
j
];
exp
d
=
((
const
char
*
const
*
)
expected
)[
j
];
}
}
/* if both pointers not null compare the strings */
/* if both pointers not null compare the strings */
if
(
exp
&&
act
)
if
(
exp
d
&&
act
)
{
{
for
(
i
=
0
;
exp
[
i
]
||
act
[
i
];
i
++
)
for
(
i
=
0
;
exp
d
[
i
]
||
act
[
i
];
i
++
)
{
{
if
(
exp
[
i
]
!=
act
[
i
])
if
(
exp
d
[
i
]
!=
act
[
i
])
{
{
Unity
.
CurrentTestFailed
=
1
;
Unity
.
CurrentTestFailed
=
1
;
break
;
break
;
...
@@ -1121,7 +1121,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
...
@@ -1121,7 +1121,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
}
}
else
else
{
/* handle case of one pointers being null (if both null, test should pass) */
{
/* handle case of one pointers being null (if both null, test should pass) */
if
(
exp
!=
act
)
if
(
exp
d
!=
act
)
{
{
Unity
.
CurrentTestFailed
=
1
;
Unity
.
CurrentTestFailed
=
1
;
}
}
...
@@ -1135,7 +1135,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
...
@@ -1135,7 +1135,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
UnityPrint
(
UnityStrElement
);
UnityPrint
(
UnityStrElement
);
UnityPrintNumberUnsigned
(
j
);
UnityPrintNumberUnsigned
(
j
);
}
}
UnityPrintExpectedAndActualStrings
(
exp
,
act
);
UnityPrintExpectedAndActualStrings
(
exp
d
,
act
);
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录