Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
cded0c80
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看板
提交
cded0c80
编写于
5月 13, 2011
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
time_t is not a long on FreeBSD, switch internal type to long long
上级
95cc5e59
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
9 deletion
+9
-9
src/conf/domain_conf.c
src/conf/domain_conf.c
+4
-4
src/conf/domain_conf.h
src/conf/domain_conf.h
+1
-1
src/esx/esx_vi_types.c
src/esx/esx_vi_types.c
+1
-1
src/esx/esx_vi_types.h
src/esx/esx_vi_types.h
+1
-1
tests/esxutilstest.c
tests/esxutilstest.c
+2
-2
未找到文件。
src/conf/domain_conf.c
浏览文件 @
cded0c80
...
...
@@ -9183,7 +9183,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr,
def
->
name
=
virXPathString
(
"string(./name)"
,
ctxt
);
if
(
def
->
name
==
NULL
)
ignore_value
(
virAsprintf
(
&
def
->
name
,
"%l
d"
,
tv
.
tv_sec
));
ignore_value
(
virAsprintf
(
&
def
->
name
,
"%l
ld"
,
(
long
long
)
tv
.
tv_sec
));
if
(
def
->
name
==
NULL
)
{
virReportOOMError
();
...
...
@@ -9193,8 +9193,8 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr,
def
->
description
=
virXPathString
(
"string(./description)"
,
ctxt
);
if
(
!
newSnapshot
)
{
if
(
virXPathLong
(
"string(./creationTime)"
,
ctxt
,
&
def
->
creationTime
)
<
0
)
{
if
(
virXPathLong
Long
(
"string(./creationTime)"
,
ctxt
,
&
def
->
creationTime
)
<
0
)
{
virDomainReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"missing creationTime from existing snapshot"
));
goto
cleanup
;
...
...
@@ -9259,7 +9259,7 @@ char *virDomainSnapshotDefFormat(char *domain_uuid,
virBufferAsprintf
(
&
buf
,
" <name>%s</name>
\n
"
,
def
->
parent
);
virBufferAddLit
(
&
buf
,
" </parent>
\n
"
);
}
virBufferAsprintf
(
&
buf
,
" <creationTime>%ld</creationTime>
\n
"
,
virBufferAsprintf
(
&
buf
,
" <creationTime>%l
l
d</creationTime>
\n
"
,
def
->
creationTime
);
virBufferAddLit
(
&
buf
,
" <domain>
\n
"
);
virBufferAsprintf
(
&
buf
,
" <uuid>%s</uuid>
\n
"
,
domain_uuid
);
...
...
src/conf/domain_conf.h
浏览文件 @
cded0c80
...
...
@@ -1042,7 +1042,7 @@ struct _virDomainSnapshotDef {
char
*
name
;
char
*
description
;
char
*
parent
;
time_t
creationTime
;
long
long
creationTime
;
/* in seconds */
int
state
;
long
active
;
...
...
src/esx/esx_vi_types.c
浏览文件 @
cded0c80
...
...
@@ -1402,7 +1402,7 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime)
int
esxVI_DateTime_ConvertToCalendarTime
(
esxVI_DateTime
*
dateTime
,
time_t
*
secondsSinceEpoch
)
long
long
*
secondsSinceEpoch
)
{
char
value
[
64
]
=
""
;
char
*
tmp
;
...
...
src/esx/esx_vi_types.h
浏览文件 @
cded0c80
...
...
@@ -264,7 +264,7 @@ int esxVI_DateTime_Serialize(esxVI_DateTime *dateTime, const char *element,
virBufferPtr
output
);
int
esxVI_DateTime_Deserialize
(
xmlNodePtr
node
,
esxVI_DateTime
**
dateTime
);
int
esxVI_DateTime_ConvertToCalendarTime
(
esxVI_DateTime
*
dateTime
,
time_t
*
secondsSinceEpoch
);
long
long
*
secondsSinceEpoch
);
...
...
tests/esxutilstest.c
浏览文件 @
cded0c80
...
...
@@ -169,7 +169,7 @@ testParseDatastorePath(const void *data ATTRIBUTE_UNUSED)
struct
testDateTime
{
const
char
*
dateTime
;
time_t
calendarTime
;
long
long
calendarTime
;
};
static
struct
testDateTime
times
[]
=
{
...
...
@@ -205,7 +205,7 @@ testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED)
{
int
i
;
esxVI_DateTime
dateTime
;
time_t
calendarTime
;
long
long
calendarTime
;
for
(
i
=
0
;
i
<
ARRAY_CARDINALITY
(
times
);
++
i
)
{
dateTime
.
value
=
(
char
*
)
times
[
i
].
dateTime
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录