External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Cleanup preprocessing structure in esxVI_EnsureSession

Browse Source
This commit is contained in:
Matthias Bolte 2010-01-30 11:16:01 +01:00
parent ce71bfa817
commit a6b00cbb16
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/esx/esx_vi.c
View File

@ -1317,16 +1317,18 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList)
* you try to call it. Query the session manager for the current session of * you try to call it. Query the session manager for the current session of
* this connection instead and re-login if there is no current session for this * this connection instead and re-login if there is no current session for this
* connection. * connection.
*
* Update: 'ESX 4.0.0 build-171294' doesn't implement this method.
*/ */
#define ESX_VI_USE_SESSION_IS_ACTIVE 0 #define ESX_VI_USE_SESSION_IS_ACTIVE 0
int int
esxVI_EnsureSession(esxVI_Context *ctx) esxVI_EnsureSession(esxVI_Context *ctx)
{ {
int result = 0;
#if ESX_VI_USE_SESSION_IS_ACTIVE #if ESX_VI_USE_SESSION_IS_ACTIVE
esxVI_Boolean active = esxVI_Boolean_Undefined; esxVI_Boolean active = esxVI_Boolean_Undefined;
#else #else
int result = 0;
esxVI_String *propertyNameList = NULL; esxVI_String *propertyNameList = NULL;
esxVI_ObjectContent *sessionManager = NULL; esxVI_ObjectContent *sessionManager = NULL;
esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_DynamicProperty *dynamicProperty = NULL;
@ -1352,6 +1354,8 @@ esxVI_EnsureSession(esxVI_Context *ctx)
return -1; return -1;
} }
} }
return 0;
#else #else
if (esxVI_String_AppendValueToList(&propertyNameList, if (esxVI_String_AppendValueToList(&propertyNameList,
"currentSession") < 0 || "currentSession") < 0 ||
@ -1388,16 +1392,11 @@ esxVI_EnsureSession(esxVI_Context *ctx)
"last login"); "last login");
goto failure; goto failure;
} }
#endif
cleanup: cleanup:
#if ESX_VI_USE_SESSION_IS_ACTIVE
/* nothing */
#else
esxVI_String_Free(&propertyNameList); esxVI_String_Free(&propertyNameList);
esxVI_ObjectContent_Free(&sessionManager); esxVI_ObjectContent_Free(&sessionManager);
esxVI_UserSession_Free(&currentSession); esxVI_UserSession_Free(&currentSession);
#endif
return result; return result;
@ -1405,8 +1404,7 @@ esxVI_EnsureSession(esxVI_Context *ctx)
result = -1; result = -1;
goto cleanup; goto cleanup;
#endif
return 0;
} }