Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
5cb926f9
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5cb926f9
编写于
2月 05, 2016
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vboxDumpDisplay: reduce indentation level
Use STREQ_NULLABLE instead of deep nesting.
上级
2ea69405
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
37 deletion
+38
-37
src/vbox/vbox_common.c
src/vbox/vbox_common.c
+38
-37
未找到文件。
src/vbox/vbox_common.c
浏览文件 @
5cb926f9
...
...
@@ -3321,54 +3321,53 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
if
(
valueTypeUtf16
)
{
VBOX_UTF16_TO_UTF8
(
valueTypeUtf16
,
&
valueTypeUtf8
);
VBOX_UTF16_FREE
(
valueTypeUtf16
);
}
if
(
STREQ
(
valueTypeUtf8
,
"sdl"
)
||
STREQ
(
valueTypeUtf8
,
"gui"
))
{
PRUnichar
*
keyDislpayUtf16
=
NULL
;
PRUnichar
*
valueDisplayUtf16
=
NULL
;
char
*
valueDisplayUtf8
=
NULL
;
if
(
STREQ_NULLABLE
(
valueTypeUtf8
,
"sdl"
)
||
STREQ_NULLABLE
(
valueTypeUtf8
,
"gui"
))
{
PRUnichar
*
keyDislpayUtf16
=
NULL
;
PRUnichar
*
valueDisplayUtf16
=
NULL
;
char
*
valueDisplayUtf8
=
NULL
;
VBOX_UTF8_TO_UTF16
(
"FRONTEND/Display"
,
&
keyDislpayUtf16
);
gVBoxAPI
.
UIMachine
.
GetExtraData
(
machine
,
keyDislpayUtf16
,
&
valueDisplayUtf16
);
VBOX_UTF16_FREE
(
keyDislpayUtf16
);
VBOX_UTF8_TO_UTF16
(
"FRONTEND/Display"
,
&
keyDislpayUtf16
);
gVBoxAPI
.
UIMachine
.
GetExtraData
(
machine
,
keyDislpayUtf16
,
&
valueDisplayUtf16
);
VBOX_UTF16_FREE
(
keyDislpayUtf16
);
if
(
valueDisplayUtf16
)
{
VBOX_UTF16_TO_UTF8
(
valueDisplayUtf16
,
&
valueDisplayUtf8
);
VBOX_UTF16_FREE
(
valueDisplayUtf16
);
if
(
valueDisplayUtf16
)
{
VBOX_UTF16_TO_UTF8
(
valueDisplayUtf16
,
&
valueDisplayUtf8
);
VBOX_UTF16_FREE
(
valueDisplayUtf16
);
if
(
strlen
(
valueDisplayUtf8
)
<=
0
)
VBOX_UTF8_FREE
(
valueDisplayUtf8
);
}
if
(
strlen
(
valueDisplayUtf8
)
<=
0
)
VBOX_UTF8_FREE
(
valueDisplayUtf8
);
}
if
(
STREQ
(
valueTypeUtf8
,
"sdl"
))
{
sdlPresent
=
1
;
if
(
VIR_STRDUP
(
sdlDisplay
,
valueDisplayUtf8
)
<
0
)
{
/* just don't go to cleanup yet as it is ok to have
* sdlDisplay as NULL and we check it below if it
* exist and then only use it there
*/
}
totalPresent
++
;
if
(
STREQ
(
valueTypeUtf8
,
"sdl"
))
{
sdlPresent
=
1
;
if
(
VIR_STRDUP
(
sdlDisplay
,
valueDisplayUtf8
)
<
0
)
{
/* just don't go to cleanup yet as it is ok to have
* sdlDisplay as NULL and we check it below if it
* exist and then only use it there
*/
}
totalPresent
++
;
}
if
(
STREQ
(
valueTypeUtf8
,
"gui"
))
{
guiPresent
=
1
;
if
(
VIR_STRDUP
(
guiDisplay
,
valueDisplayUtf8
)
<
0
)
{
/* just don't go to cleanup yet as it is ok to have
* guiDisplay as NULL and we check it below if it
* exist and then only use it there
*/
}
totalPresent
++
;
if
(
STREQ
(
valueTypeUtf8
,
"gui"
))
{
guiPresent
=
1
;
if
(
VIR_STRDUP
(
guiDisplay
,
valueDisplayUtf8
)
<
0
)
{
/* just don't go to cleanup yet as it is ok to have
* guiDisplay as NULL and we check it below if it
* exist and then only use it there
*/
}
VBOX_UTF8_FREE
(
valueDisplayUtf8
)
;
totalPresent
++
;
}
if
(
STREQ
(
valueTypeUtf8
,
"vrdp"
))
vrdpPresent
=
1
;
VBOX_UTF8_FREE
(
valueTypeUtf8
);
VBOX_UTF8_FREE
(
valueDisplayUtf8
);
}
if
(
STREQ_NULLABLE
(
valueTypeUtf8
,
"vrdp"
))
vrdpPresent
=
1
;
if
((
totalPresent
>
0
)
&&
(
VIR_ALLOC_N
(
def
->
graphics
,
totalPresent
)
>=
0
))
{
if
((
guiPresent
)
&&
(
VIR_ALLOC
(
def
->
graphics
[
def
->
ngraphics
])
>=
0
))
{
def
->
graphics
[
def
->
ngraphics
]
->
type
=
VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP
;
...
...
@@ -3441,6 +3440,8 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
}
VBOX_RELEASE
(
VRDxServer
);
}
VBOX_UTF8_FREE
(
valueTypeUtf8
);
}
static
void
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录