os-cmpi-xen

changeset 31:33d4316c01a2

Fixed compilation warings throughout the project. Nearly all files touched.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
author jfehlig@jfehlig3.provo.novell.com
date Tue Oct 24 11:30:03 2006 -0600 (2006-10-24)
parents 7c937c187b5e
children 75b18359b74d
files src/Xen_CSElementCapabilities.c src/Xen_CSElementSettingData.c src/Xen_CSSettingDataComponent.c src/Xen_ComputerSystem.c src/Xen_ComputerSystemCapabilities.c src/Xen_ComputerSystemCapabilities_Resource.c src/Xen_ComputerSystemCapabilities_Resource.h src/Xen_ComputerSystemDisk.c src/Xen_ComputerSystemMemory.c src/Xen_ComputerSystemNetworkPort.c src/Xen_ComputerSystemProcessor.c src/Xen_ComputerSystemSettingData.c src/Xen_ComputerSystemSettingData_Resource.c src/Xen_ComputerSystemSettingData_Resource.h src/Xen_ComputerSystem_Resource.c src/Xen_ComputerSystem_Resource.h src/Xen_Disk.c src/Xen_DiskElementSettingData.c src/Xen_DiskSettingData.c src/Xen_DiskSettingData_Resource.c src/Xen_DiskSettingData_Resource.h src/Xen_Disk_Resource.c src/Xen_Disk_Resource.h src/Xen_ElementConformsToSVProfile.c src/Xen_ElementConformsToVSProfile.c src/Xen_HasVirtualizationCapabilities.c src/Xen_HostedComputerSystem.c src/Xen_HostedDisk.c src/Xen_HostedMemory.c src/Xen_HostedMemoryPool.c src/Xen_HostedNetworkPort.c src/Xen_HostedProcessor.c src/Xen_HostedProcessorPool.c src/Xen_HostedVirtualSystemManagementService.c src/Xen_Memory.c src/Xen_MemoryAllocatedFromPool.c src/Xen_MemoryCapabilitiesSettingData.c src/Xen_MemoryCapabilitiesSettingData_Resource.c src/Xen_MemoryCapabilitiesSettingData_Resource.h src/Xen_MemoryElementSettingData.c src/Xen_MemoryPool.c src/Xen_MemoryPoolComponent.c src/Xen_MemoryPool_Resource.c src/Xen_MemoryPool_Resource.h src/Xen_MemorySettingAllocationFromPool.c src/Xen_MemorySettingData.c src/Xen_MemorySettingData_Resource.c src/Xen_MemorySettingData_Resource.h src/Xen_Memory_Resource.c src/Xen_Memory_Resource.h src/Xen_NetworkPort.c src/Xen_NetworkPortElementSettingData.c src/Xen_NetworkPortSettingData.c src/Xen_NetworkPortSettingData_Resource.c src/Xen_NetworkPortSettingData_Resource.h src/Xen_NetworkPort_Resource.c src/Xen_NetworkPort_Resource.h src/Xen_OperatingSystem.c src/Xen_OperatingSystem_Resource.c src/Xen_OperatingSystem_Resource.h src/Xen_Processor.c src/Xen_ProcessorAllocatedFromPool.c src/Xen_ProcessorCapabilitiesSettingData.c src/Xen_ProcessorCapabilitiesSettingData_Resource.c src/Xen_ProcessorCapabilitiesSettingData_Resource.h src/Xen_ProcessorElementSettingData.c src/Xen_ProcessorPool.c src/Xen_ProcessorPoolComponent.c src/Xen_ProcessorPool_Resource.c src/Xen_ProcessorPool_Resource.h src/Xen_ProcessorSettingAllocationFromPool.c src/Xen_ProcessorSettingData.c src/Xen_ProcessorSettingData_Resource.c src/Xen_ProcessorSettingData_Resource.h src/Xen_Processor_Resource.c src/Xen_Processor_Resource.h src/Xen_RegisteredProfiles.c src/Xen_RunningOS.c src/Xen_VSMSElementCapabilities.c src/Xen_VirtualSystemManagementCapabilities.c src/Xen_VirtualSystemManagementCapabilities_Resource.c src/Xen_VirtualSystemManagementCapabilities_Resource.h src/Xen_VirtualSystemManagementService.c src/Xen_VirtualSystemManagementService_Resource.c src/Xen_VirtualSystemManagementService_Resource.h src/Xen_VirtualizationCapabilities.c src/Xen_VirtualizationCapabilities_Resource.c src/Xen_VirtualizationCapabilities_Resource.h src/cmpiutil.c src/cmpiutil.h
line diff
     1.1 --- a/src/Xen_CSElementCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
     1.2 +++ b/src/Xen_CSElementCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
     1.3 @@ -32,7 +32,7 @@
     1.4  // ----------------------------------------------------------------------------
     1.5  
     1.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
     1.7 -static CMPIBroker *_BROKER;
     1.8 +static const CMPIBroker *_BROKER;
     1.9  
    1.10  /* Include utility functions */
    1.11  #include "cmpiutil.h"
    1.12 @@ -66,7 +66,8 @@ static char * _RHSKEYNAME = "InstanceID"
    1.13  // ----------------------------------------------------------------------------
    1.14  static CMPIStatus AssociationCleanup(
    1.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    1.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    1.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    1.19  {
    1.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    1.21  
    1.22 @@ -75,8 +76,6 @@ static CMPIStatus AssociationCleanup(
    1.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    1.24  
    1.25     /* Nothing needs to be done for cleanup. */
    1.26 -
    1.27 -exit:
    1.28     _SBLIM_RETURNSTATUS(status);
    1.29  }
    1.30  
    1.31 @@ -86,9 +85,9 @@ exit:
    1.32  // ----------------------------------------------------------------------------
    1.33  static CMPIStatus AssociatorNames(
    1.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    1.36 -		CMPIResult * results,		/* [out] Results of this operation. */
    1.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    1.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    1.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
    1.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    1.41  		const char * assocClass,
    1.42  		const char * resultClass,
    1.43  		const char * role,
    1.44 @@ -187,14 +186,14 @@ exit:
    1.45  // ----------------------------------------------------------------------------
    1.46  static CMPIStatus Associators(
    1.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    1.49 -		CMPIResult * results,		/* [out] Results of this operation. */
    1.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    1.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    1.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
    1.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    1.54  		const char *assocClass,
    1.55  		const char *resultClass,
    1.56  		const char *role,
    1.57  		const char *resultRole,
    1.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
    1.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    1.60  {
    1.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    1.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    1.63 @@ -294,9 +293,9 @@ exit:
    1.64  // ----------------------------------------------------------------------------
    1.65  static CMPIStatus ReferenceNames(
    1.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    1.68 -		CMPIResult * results,		/* [out] Results of this operation. */
    1.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    1.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    1.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
    1.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    1.73  		const char *assocClass, 
    1.74  		const char *role)
    1.75  {
    1.76 @@ -411,12 +410,12 @@ exit:
    1.77  // ----------------------------------------------------------------------------
    1.78  static CMPIStatus References(
    1.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    1.81 -		CMPIResult * results,		/* [out] Results of this operation. */
    1.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    1.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    1.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
    1.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    1.86  		const char *assocClass,
    1.87  		const char *role,
    1.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
    1.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
    1.90  {
    1.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    1.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    1.93 @@ -528,15 +527,13 @@ exit:
    1.94  // ----------------------------------------------------------------------------
    1.95  static void AssociationInitialize(
    1.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    1.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    1.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
    1.99  {
   1.100     _SBLIM_ENTER("AssociationInitialize");
   1.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   1.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   1.103  
   1.104     /* Nothing needs to be done to initialize this provider */
   1.105 -
   1.106 -exit:
   1.107     _SBLIM_RETURN();
   1.108  }
   1.109  
     2.1 --- a/src/Xen_CSElementSettingData.c	Fri Oct 20 13:20:15 2006 -0600
     2.2 +++ b/src/Xen_CSElementSettingData.c	Tue Oct 24 11:30:03 2006 -0600
     2.3 @@ -15,7 +15,7 @@
     2.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     2.5  // ============================================================================
     2.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
     2.7 -// Contributors:
     2.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
     2.9  // Description:
    2.10  // ============================================================================
    2.11  
    2.12 @@ -32,7 +32,7 @@
    2.13  // ----------------------------------------------------------------------------
    2.14  
    2.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    2.16 -static CMPIBroker *_BROKER;
    2.17 +static const CMPIBroker *_BROKER;
    2.18  
    2.19  /* Include utility functions */
    2.20  #include "cmpiutil.h"
    2.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "Name";
    2.22  // ----------------------------------------------------------------------------
    2.23  static CMPIStatus AssociationCleanup(
    2.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    2.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    2.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    2.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    2.28  {
    2.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    2.30  
    2.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
    2.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    2.33  
    2.34     /* Nothing needs to be done for cleanup. */
    2.35 -
    2.36 -exit:
    2.37     _SBLIM_RETURNSTATUS(status);
    2.38  }
    2.39  
    2.40 @@ -84,9 +83,9 @@ exit:
    2.41  // ----------------------------------------------------------------------------
    2.42  static CMPIStatus AssociatorNames(
    2.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    2.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    2.45 -		CMPIResult * results,		/* [out] Results of this operation. */
    2.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    2.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    2.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
    2.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    2.50  		const char * assocClass,
    2.51  		const char * resultClass,
    2.52  		const char * role,
    2.53 @@ -185,14 +184,14 @@ exit:
    2.54  // ----------------------------------------------------------------------------
    2.55  static CMPIStatus Associators(
    2.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    2.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    2.58 -		CMPIResult * results,		/* [out] Results of this operation. */
    2.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    2.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    2.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
    2.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    2.63  		const char *assocClass,
    2.64  		const char *resultClass,
    2.65  		const char *role,
    2.66  		const char *resultRole,
    2.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
    2.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    2.69  {
    2.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    2.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    2.72 @@ -290,9 +289,9 @@ exit:
    2.73  // ----------------------------------------------------------------------------
    2.74  static CMPIStatus ReferenceNames(
    2.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    2.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    2.77 -		CMPIResult * results,		/* [out] Results of this operation. */
    2.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    2.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    2.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
    2.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    2.82  		const char *assocClass, 
    2.83  		const char *role)
    2.84  {
    2.85 @@ -403,12 +402,12 @@ exit:
    2.86  // ----------------------------------------------------------------------------
    2.87  static CMPIStatus References(
    2.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    2.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    2.90 -		CMPIResult * results,		/* [out] Results of this operation. */
    2.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    2.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    2.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
    2.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    2.95  		const char *assocClass,
    2.96  		const char *role,
    2.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
    2.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
    2.99  {
   2.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   2.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   2.102 @@ -518,15 +517,13 @@ exit:
   2.103  // ----------------------------------------------------------------------------
   2.104  static void AssociationInitialize(
   2.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   2.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   2.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   2.108  {
   2.109     _SBLIM_ENTER("AssociationInitialize");
   2.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   2.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   2.112  
   2.113     /* Nothing needs to be done to initialize this provider */
   2.114 -
   2.115 -exit:
   2.116     _SBLIM_RETURN();
   2.117  }
   2.118  
     3.1 --- a/src/Xen_CSSettingDataComponent.c	Fri Oct 20 13:20:15 2006 -0600
     3.2 +++ b/src/Xen_CSSettingDataComponent.c	Tue Oct 24 11:30:03 2006 -0600
     3.3 @@ -15,7 +15,7 @@
     3.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     3.5  // ============================================================================
     3.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
     3.7 -// Contributors:
     3.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
     3.9  // Description:
    3.10  // ============================================================================
    3.11  
    3.12 @@ -32,7 +32,7 @@
    3.13  // ----------------------------------------------------------------------------
    3.14  
    3.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    3.16 -static CMPIBroker *_BROKER;
    3.17 +static const CMPIBroker *_BROKER;
    3.18  
    3.19  /* Include utility functions */
    3.20  #include "cmpiutil.h"
    3.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "InstanceID"
    3.22  // ----------------------------------------------------------------------------
    3.23  static CMPIStatus AssociationCleanup(
    3.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    3.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    3.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    3.28  {
    3.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    3.30  
    3.31 @@ -84,9 +85,9 @@ exit:
    3.32  // ----------------------------------------------------------------------------
    3.33  static CMPIStatus AssociatorNames(
    3.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    3.36 -		CMPIResult * results,		/* [out] Results of this operation. */
    3.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    3.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    3.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
    3.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    3.41  		const char * assocClass,
    3.42  		const char * resultClass,
    3.43  		const char * role,
    3.44 @@ -190,14 +191,14 @@ exit:
    3.45  // ----------------------------------------------------------------------------
    3.46  static CMPIStatus Associators(
    3.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    3.49 -		CMPIResult * results,		/* [out] Results of this operation. */
    3.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    3.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    3.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
    3.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    3.54  		const char *assocClass,
    3.55  		const char *resultClass,
    3.56  		const char *role,
    3.57  		const char *resultRole,
    3.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
    3.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    3.60  {
    3.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    3.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    3.63 @@ -300,9 +301,9 @@ exit:
    3.64  // ----------------------------------------------------------------------------
    3.65  static CMPIStatus ReferenceNames(
    3.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    3.68 -		CMPIResult * results,		/* [out] Results of this operation. */
    3.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    3.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    3.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
    3.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    3.73  		const char *assocClass, 
    3.74  		const char *role)
    3.75  {
    3.76 @@ -418,12 +419,12 @@ exit:
    3.77  // ----------------------------------------------------------------------------
    3.78  static CMPIStatus References(
    3.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    3.81 -		CMPIResult * results,		/* [out] Results of this operation. */
    3.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    3.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    3.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
    3.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    3.86  		const char *assocClass,
    3.87  		const char *role,
    3.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
    3.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
    3.90  {
    3.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    3.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    3.93 @@ -538,15 +539,13 @@ exit:
    3.94  // ----------------------------------------------------------------------------
    3.95  static void AssociationInitialize(
    3.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    3.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    3.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
    3.99  {
   3.100     _SBLIM_ENTER("AssociationInitialize");
   3.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   3.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   3.103  
   3.104     /* Nothing needs to be done to initialize this provider */
   3.105 -
   3.106 -exit:
   3.107     _SBLIM_RETURN();
   3.108  }
   3.109  
     4.1 --- a/src/Xen_ComputerSystem.c	Fri Oct 20 13:20:15 2006 -0600
     4.2 +++ b/src/Xen_ComputerSystem.c	Tue Oct 24 11:30:03 2006 -0600
     4.3 @@ -35,7 +35,7 @@
     4.4  // ----------------------------------------------------------------------------
     4.5  
     4.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
     4.7 -static CMPIBroker *_BROKER;
     4.8 +static const CMPIBroker *_BROKER;
     4.9  
    4.10  /* Include utility functions */
    4.11  #include "cmpiutil.h"
    4.12 @@ -69,8 +69,10 @@ const static char * _KEYNAMES[] = {"Name
    4.13  // ----------------------------------------------------------------------------
    4.14  static CMPIStatus Cleanup(
    4.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    4.17 +		const CMPIContext * context,  /* [in] Additional context info, if any. */
    4.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    4.19  {
    4.20 +   (void)terminating;
    4.21     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    4.22  
    4.23     _SBLIM_ENTER("Cleanup");
    4.24 @@ -78,8 +80,6 @@ static CMPIStatus Cleanup(
    4.25     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    4.26  
    4.27     /* Nothing needs to be done for cleanup. */
    4.28 -
    4.29 -exit:
    4.30     _SBLIM_RETURNSTATUS(status);
    4.31  }
    4.32  
    4.33 @@ -89,9 +89,9 @@ exit:
    4.34  // ----------------------------------------------------------------------------
    4.35  static CMPIStatus EnumInstanceNames(
    4.36  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.37 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    4.38 -		CMPIResult * results,		/* [out] Results of this operation. */
    4.39 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
    4.40 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    4.41 +		const CMPIResult * results,		/* [out] Results of this operation. */
    4.42 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
    4.43  {
    4.44     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    4.45     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
    4.46 @@ -175,9 +175,9 @@ exit:
    4.47  // ----------------------------------------------------------------------------
    4.48  static CMPIStatus EnumInstances(
    4.49  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.50 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    4.51 -		CMPIResult * results,		/* [out] Results of this operation. */
    4.52 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
    4.53 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    4.54 +		const CMPIResult * results,		/* [out] Results of this operation. */
    4.55 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
    4.56  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
    4.57  {
    4.58     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    4.59 @@ -262,9 +262,9 @@ exit:
    4.60  // ----------------------------------------------------------------------------
    4.61  static CMPIStatus GetInstance(
    4.62  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.63 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    4.64 -		CMPIResult * results,		/* [out] Results of this operation. */
    4.65 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.66 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    4.67 +		const CMPIResult * results,		/* [out] Results of this operation. */
    4.68 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.69  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    4.70  {
    4.71     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    4.72 @@ -353,10 +353,11 @@ exit:
    4.73  // ----------------------------------------------------------------------------
    4.74  static CMPIStatus SetInstance(
    4.75  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    4.77 -		CMPIResult * results,		/* [out] Results of this operation. */
    4.78 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.79 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
    4.80 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    4.81 +		const CMPIResult * results,		/* [out] Results of this operation. */
    4.82 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.83 +		const CMPIInstance * newinstance,
    4.84 +        const char **properties)	/* [in] Contains the new instance data. */
    4.85  {
    4.86     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    4.87     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
    4.88 @@ -430,10 +431,10 @@ exit:
    4.89  // ----------------------------------------------------------------------------
    4.90  static CMPIStatus CreateInstance(
    4.91  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    4.92 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    4.93 -		CMPIResult * results,		/* [out] Results of this operation. */
    4.94 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.95 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
    4.96 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    4.97 +		const CMPIResult * results,		/* [out] Results of this operation. */
    4.98 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    4.99 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   4.100  {
   4.101     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   4.102     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   4.103 @@ -514,9 +515,9 @@ exit:
   4.104  // ----------------------------------------------------------------------------
   4.105  static CMPIStatus DeleteInstance(
   4.106  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   4.107 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   4.108 -		CMPIResult * results,		/* [out] Results of this operation. */
   4.109 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
   4.110 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   4.111 +		const CMPIResult * results,		/* [out] Results of this operation. */
   4.112 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
   4.113  {
   4.114     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   4.115     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   4.116 @@ -590,11 +591,11 @@ exit:
   4.117  // ----------------------------------------------------------------------------
   4.118  static CMPIStatus ExecQuery(
   4.119  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   4.120 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   4.121 -		CMPIResult * results,		/* [out] Results of this operation. */
   4.122 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
   4.123 -		char * language,		/* [in] Name of the query language. */
   4.124 -		char * query)			/* [in] Text of the query written in the query language. */
   4.125 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   4.126 +		const CMPIResult * results,		/* [out] Results of this operation. */
   4.127 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
   4.128 +		const char * language,		/* [in] Name of the query language. */
   4.129 +		const char * query)			/* [in] Text of the query written in the query language. */
   4.130  {
   4.131     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
   4.132     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   4.133 @@ -629,17 +630,13 @@ exit:
   4.134  // ----------------------------------------------------------------------------
   4.135  static void Initialize(
   4.136  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   4.137 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   4.138 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   4.139  {
   4.140 -   CMPIString *temp;
   4.141 -   
   4.142     _SBLIM_ENTER("Initialize");
   4.143     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   4.144     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   4.145  
   4.146     /* Nothing needs to be done to initialize this provider */
   4.147 -
   4.148 -exit:
   4.149     _SBLIM_RETURN();
   4.150  }
   4.151  
   4.152 @@ -648,6 +645,7 @@ exit:
   4.153  // ============================================================================
   4.154  CMInstanceMIStub( , Xen_ComputerSystem, _BROKER, Initialize(&mi, ctx));
   4.155  
   4.156 +
   4.157  // ============================================================================
   4.158  // CMPI METHOD PROVIDER FUNCTION TABLE
   4.159  // ============================================================================
   4.160 @@ -657,9 +655,11 @@ CMInstanceMIStub( , Xen_ComputerSystem, 
   4.161  // Perform any necessary cleanup immediately before this provider is unloaded.
   4.162  // ----------------------------------------------------------------------------
   4.163  static CMPIStatus MethodCleanup(
   4.164 -                CMPIInstanceMI * self,          /* [in] Handle to this provider (i.e. 'self'). */
   4.165 -                CMPIContext * context)          /* [in] Additional context info, if any. */
   4.166 +                CMPIMethodMI * self,          /* [in] Handle to this provider (i.e. 'self'). */
   4.167 +                const CMPIContext * context,          /* [in] Additional context info, if any. */
   4.168 +                CMPIBoolean terminating)   /* [in] True if MB is terminating */
   4.169  {
   4.170 +   (void)terminating;
   4.171     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   4.172  
   4.173     _SBLIM_ENTER("MethodCleanup");
   4.174 @@ -667,8 +667,6 @@ static CMPIStatus MethodCleanup(
   4.175     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   4.176  
   4.177     /* Nothing needs to be done for cleanup. */
   4.178 -
   4.179 -exit:
   4.180     _SBLIM_RETURNSTATUS(status);
   4.181  }
   4.182  
   4.183 @@ -683,11 +681,11 @@ exit:
   4.184  // ----------------------------------------------------------------------------
   4.185  static CMPIStatus InvokeMethod(
   4.186                  CMPIMethodMI * self,            /* [in] Handle to this provider (i.e. 'self') */
   4.187 -                CMPIContext * context,          /* [in] Additional context info, if any */
   4.188 -                CMPIResult * results,           /* [out] Results of this operation */
   4.189 -                CMPIObjectPath * reference,     /* [in] Contains the CIM namespace, classname and desired object path */
   4.190 -                char * methodname,              /* [in] Name of the method to apply against the reference object */
   4.191 -                CMPIArgs * argsin,              /* [in] Method input arguments */
   4.192 +                const CMPIContext * context,          /* [in] Additional context info, if any */
   4.193 +                const CMPIResult * results,           /* [out] Results of this operation */
   4.194 +                const CMPIObjectPath * reference,     /* [in] Contains the CIM namespace, classname and desired object path */
   4.195 +                const char * methodname,              /* [in] Name of the method to apply against the reference object */
   4.196 +                const CMPIArgs * argsin,              /* [in] Method input arguments */
   4.197                  CMPIArgs * argsout)             /* [in] Method output arguments */
   4.198  {
   4.199     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
   4.200 @@ -972,4 +970,3 @@ exit:
   4.201  // CMPI METHOD PROVIDER FUNCTION TABLE SETUP
   4.202  // ============================================================================
   4.203  CMMethodMIStub( , Xen_ComputerSystem, _BROKER, CMNoHook);
   4.204 -
     5.1 --- a/src/Xen_ComputerSystemCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
     5.2 +++ b/src/Xen_ComputerSystemCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
     5.3 @@ -31,7 +31,7 @@
     5.4  // ----------------------------------------------------------------------------
     5.5  
     5.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
     5.7 -static CMPIBroker *_BROKER;
     5.8 +static const CMPIBroker *_BROKER;
     5.9  
    5.10  /* Include utility functions */
    5.11  #include "cmpiutil.h"
    5.12 @@ -65,7 +65,8 @@ const static char * _KEYNAMES[] = {"Inst
    5.13  // ----------------------------------------------------------------------------
    5.14  static CMPIStatus Cleanup(
    5.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    5.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    5.19  {
    5.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    5.21  
    5.22 @@ -74,8 +75,6 @@ static CMPIStatus Cleanup(
    5.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    5.24  
    5.25     /* Nothing needs to be done for cleanup. */
    5.26 -
    5.27 -exit:
    5.28     _SBLIM_RETURNSTATUS(status);
    5.29  }
    5.30  
    5.31 @@ -85,9 +84,9 @@ exit:
    5.32  // ----------------------------------------------------------------------------
    5.33  static CMPIStatus EnumInstanceNames(
    5.34  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    5.36 -		CMPIResult * results,		/* [out] Results of this operation. */
    5.37 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
    5.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
    5.40 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
    5.41  {
    5.42     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    5.43     _RESOURCES * resources;			/* Handle to the list of system resources. */
    5.44 @@ -165,9 +164,9 @@ exit:
    5.45  // ----------------------------------------------------------------------------
    5.46  static CMPIStatus EnumInstances(
    5.47  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    5.49 -		CMPIResult * results,		/* [out] Results of this operation. */
    5.50 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
    5.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
    5.53 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
    5.54  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
    5.55  {
    5.56     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    5.57 @@ -246,9 +245,9 @@ exit:
    5.58  // ----------------------------------------------------------------------------
    5.59  static CMPIStatus GetInstance(
    5.60  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.61 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    5.62 -		CMPIResult * results,		/* [out] Results of this operation. */
    5.63 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.64 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.65 +		const CMPIResult * results,		/* [out] Results of this operation. */
    5.66 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.67  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    5.68  {
    5.69     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    5.70 @@ -331,10 +330,11 @@ exit:
    5.71  // ----------------------------------------------------------------------------
    5.72  static CMPIStatus SetInstance(
    5.73  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.74 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    5.75 -		CMPIResult * results,		/* [out] Results of this operation. */
    5.76 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.77 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
    5.78 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.79 +		const CMPIResult * results,		/* [out] Results of this operation. */
    5.80 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.81 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
    5.82 +        const char **properties)  /* [in] Contains list of modified properties. */
    5.83  {
    5.84     _SBLIM_ENTER("SetInstance");
    5.85  
    5.86 @@ -350,10 +350,10 @@ static CMPIStatus SetInstance(
    5.87  // ----------------------------------------------------------------------------
    5.88  static CMPIStatus CreateInstance(
    5.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
    5.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    5.91 -		CMPIResult * results,		/* [out] Results of this operation. */
    5.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
    5.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    5.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
    5.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
    5.97 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
    5.98  {
    5.99     _SBLIM_ENTER("CreateInstance");
   5.100  
   5.101 @@ -369,9 +369,9 @@ static CMPIStatus CreateInstance(
   5.102  // ----------------------------------------------------------------------------
   5.103  static CMPIStatus DeleteInstance(
   5.104  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   5.105 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   5.106 -		CMPIResult * results,		/* [out] Results of this operation. */
   5.107 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
   5.108 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   5.109 +		const CMPIResult * results,		/* [out] Results of this operation. */
   5.110 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
   5.111  {
   5.112     _SBLIM_ENTER("DeleteInstance");
   5.113  
   5.114 @@ -388,11 +388,11 @@ static CMPIStatus DeleteInstance(
   5.115  // ----------------------------------------------------------------------------
   5.116  static CMPIStatus ExecQuery(
   5.117  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   5.118 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   5.119 -		CMPIResult * results,		/* [out] Results of this operation. */
   5.120 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
   5.121 -		char * language,		/* [in] Name of the query language. */
   5.122 -		char * query)			/* [in] Text of the query written in the query language. */
   5.123 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   5.124 +		const CMPIResult * results,		/* [out] Results of this operation. */
   5.125 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
   5.126 +		const char * language,		/* [in] Name of the query language. */
   5.127 +		const char * query)			/* [in] Text of the query written in the query language. */
   5.128  {
   5.129     _SBLIM_ENTER("ExecQuery");
   5.130  
   5.131 @@ -412,15 +412,13 @@ static CMPIStatus ExecQuery(
   5.132  // ----------------------------------------------------------------------------
   5.133  static void Initialize(
   5.134  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   5.135 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   5.136 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   5.137  {
   5.138     _SBLIM_ENTER("Initialize");
   5.139     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   5.140     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   5.141  
   5.142     /* Nothing needs to be done to initialize this provider */
   5.143 -
   5.144 -exit:
   5.145     _SBLIM_RETURN();
   5.146  }
   5.147  
     6.1 --- a/src/Xen_ComputerSystemCapabilities_Resource.c	Fri Oct 20 13:20:15 2006 -0600
     6.2 +++ b/src/Xen_ComputerSystemCapabilities_Resource.c	Tue Oct 24 11:30:03 2006 -0600
     6.3 @@ -107,7 +107,7 @@ int Xen_ComputerSystemCapabilities_getNe
     6.4  // ----------------------------------------------------------------------------
     6.5  
     6.6  /* Get the specific resource that matches the CMPI object path. */
     6.7 -int Xen_ComputerSystemCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
     6.8 +int Xen_ComputerSystemCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
     6.9  {
    6.10     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
    6.11  
    6.12 @@ -147,7 +147,7 @@ int Xen_ComputerSystemCapabilities_freeR
    6.13  // ---------------------------------------------------------------------------- 
    6.14  
    6.15  /* Set the property values of a CMPI instance from a specific resource. */
    6.16 -int Xen_ComputerSystemCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
    6.17 +int Xen_ComputerSystemCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
    6.18  {
    6.19     CMPIArray *statesSupported = CMNewArray(broker, 6, CMPI_uint16, NULL);
    6.20    
    6.21 @@ -195,7 +195,7 @@ int Xen_ComputerSystemCapabilities_delet
    6.22  // ----------------------------------------------------------------------------
    6.23  
    6.24  /* Modify the specified resource using the property values of a CMPI instance. */
    6.25 -int Xen_ComputerSystemCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
    6.26 +int Xen_ComputerSystemCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
    6.27  {
    6.28     /* Unsupported. */
    6.29     return -1;
    6.30 @@ -204,7 +204,7 @@ int Xen_ComputerSystemCapabilities_setRe
    6.31  // ----------------------------------------------------------------------------
    6.32  
    6.33  /* Create a new resource using the property values of a CMPI instance. */
    6.34 -int Xen_ComputerSystemCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
    6.35 +int Xen_ComputerSystemCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
    6.36  {
    6.37     /* Unsupported. */
    6.38     return -1;
     7.1 --- a/src/Xen_ComputerSystemCapabilities_Resource.h	Fri Oct 20 13:20:15 2006 -0600
     7.2 +++ b/src/Xen_ComputerSystemCapabilities_Resource.h	Tue Oct 24 11:30:03 2006 -0600
     7.3 @@ -69,13 +69,13 @@ int Xen_ComputerSystemCapabilities_freeR
     7.4  int Xen_ComputerSystemCapabilities_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
     7.5  
     7.6  /* Get the specific resource that matches the CMPI object path. */
     7.7 -int Xen_ComputerSystemCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
     7.8 +int Xen_ComputerSystemCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
     7.9  
    7.10  /* Free/deallocate/cleanup a resource after use. */
    7.11  int Xen_ComputerSystemCapabilities_freeResource( _RESOURCE * resource );
    7.12  
    7.13  /* Set the property values of a CMPI instance from a specific resource. */
    7.14 -int Xen_ComputerSystemCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
    7.15 +int Xen_ComputerSystemCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
    7.16  
    7.17  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
    7.18  
    7.19 @@ -83,8 +83,8 @@ int Xen_ComputerSystemCapabilities_setIn
    7.20  int Xen_ComputerSystemCapabilities_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
    7.21  
    7.22  /* Modify the specified resource using the property values of a CMPI instance. */
    7.23 -int Xen_ComputerSystemCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
    7.24 +int Xen_ComputerSystemCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
    7.25  
    7.26  /* Create a new resource using the property values of a CMPI instance. */
    7.27 -int Xen_ComputerSystemCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
    7.28 +int Xen_ComputerSystemCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
    7.29  
     8.1 --- a/src/Xen_ComputerSystemDisk.c	Fri Oct 20 13:20:15 2006 -0600
     8.2 +++ b/src/Xen_ComputerSystemDisk.c	Tue Oct 24 11:30:03 2006 -0600
     8.3 @@ -32,7 +32,7 @@
     8.4  // ----------------------------------------------------------------------------
     8.5  
     8.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
     8.7 -static CMPIBroker *_BROKER;
     8.8 +static const CMPIBroker *_BROKER;
     8.9  
    8.10  /* Include utility functions */
    8.11  #include "cmpiutil.h"
    8.12 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "Name";
    8.13  // ----------------------------------------------------------------------------
    8.14  static CMPIStatus AssociationCleanup(
    8.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    8.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    8.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
    8.19  {
    8.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    8.21  
    8.22 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
    8.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    8.24  
    8.25     /* Nothing needs to be done for cleanup. */
    8.26 -
    8.27 -exit:
    8.28     _SBLIM_RETURNSTATUS(status);
    8.29  }
    8.30  
    8.31 @@ -84,9 +83,9 @@ exit:
    8.32  // ----------------------------------------------------------------------------
    8.33  static CMPIStatus AssociatorNames(
    8.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    8.36 -		CMPIResult * results,		/* [out] Results of this operation. */
    8.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    8.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    8.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
    8.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    8.41  		const char * assocClass,
    8.42  		const char * resultClass,
    8.43  		const char * role,
    8.44 @@ -185,14 +184,14 @@ exit:
    8.45  // ----------------------------------------------------------------------------
    8.46  static CMPIStatus Associators(
    8.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    8.49 -		CMPIResult * results,		/* [out] Results of this operation. */
    8.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    8.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    8.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
    8.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    8.54  		const char *assocClass,
    8.55  		const char *resultClass,
    8.56  		const char *role,
    8.57  		const char *resultRole,
    8.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
    8.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    8.60  {
    8.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    8.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    8.63 @@ -290,9 +289,9 @@ exit:
    8.64  // ----------------------------------------------------------------------------
    8.65  static CMPIStatus ReferenceNames(
    8.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    8.68 -		CMPIResult * results,		/* [out] Results of this operation. */
    8.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    8.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    8.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
    8.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    8.73  		const char *assocClass, 
    8.74  		const char *role)
    8.75  {
    8.76 @@ -403,12 +402,12 @@ exit:
    8.77  // ----------------------------------------------------------------------------
    8.78  static CMPIStatus References(
    8.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    8.81 -		CMPIResult * results,		/* [out] Results of this operation. */
    8.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    8.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    8.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
    8.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    8.86  		const char *assocClass,
    8.87  		const char *role,
    8.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
    8.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
    8.90  {
    8.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    8.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    8.93 @@ -518,15 +517,13 @@ exit:
    8.94  // ----------------------------------------------------------------------------
    8.95  static void AssociationInitialize(
    8.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    8.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    8.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
    8.99  {
   8.100     _SBLIM_ENTER("AssociationInitialize");
   8.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   8.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   8.103  
   8.104     /* Nothing needs to be done to initialize this provider */
   8.105 -
   8.106 -exit:
   8.107     _SBLIM_RETURN();
   8.108  }
   8.109  
     9.1 --- a/src/Xen_ComputerSystemMemory.c	Fri Oct 20 13:20:15 2006 -0600
     9.2 +++ b/src/Xen_ComputerSystemMemory.c	Tue Oct 24 11:30:03 2006 -0600
     9.3 @@ -15,7 +15,7 @@
     9.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     9.5  // ============================================================================
     9.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
     9.7 -// Contributors:
     9.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
     9.9  // Description:
    9.10  // ============================================================================
    9.11  
    9.12 @@ -32,7 +32,7 @@
    9.13  // ----------------------------------------------------------------------------
    9.14  
    9.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    9.16 -static CMPIBroker *_BROKER;
    9.17 +static const CMPIBroker *_BROKER;
    9.18  
    9.19  /* Include utility functions */
    9.20  #include "cmpiutil.h"
    9.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "Name";
    9.22  // ----------------------------------------------------------------------------
    9.23  static CMPIStatus AssociationCleanup(
    9.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    9.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
    9.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    9.27 +        CMPIBoolean terminating)  /* [in] True if MB is terminating */
    9.28  {
    9.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
    9.30  
    9.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
    9.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
    9.33  
    9.34     /* Nothing needs to be done for cleanup. */
    9.35 -
    9.36 -exit:
    9.37     _SBLIM_RETURNSTATUS(status);
    9.38  }
    9.39  
    9.40 @@ -84,9 +83,9 @@ exit:
    9.41  // ----------------------------------------------------------------------------
    9.42  static CMPIStatus AssociatorNames(
    9.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    9.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    9.45 -		CMPIResult * results,		/* [out] Results of this operation. */
    9.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    9.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    9.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
    9.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
    9.50  		const char * assocClass,
    9.51  		const char * resultClass,
    9.52  		const char * role,
    9.53 @@ -185,14 +184,14 @@ exit:
    9.54  // ----------------------------------------------------------------------------
    9.55  static CMPIStatus Associators(
    9.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    9.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    9.58 -		CMPIResult * results,		/* [out] Results of this operation. */
    9.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    9.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    9.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
    9.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    9.63  		const char *assocClass,
    9.64  		const char *resultClass,
    9.65  		const char *role,
    9.66  		const char *resultRole,
    9.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
    9.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
    9.69  {
    9.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
    9.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
    9.72 @@ -290,9 +289,9 @@ exit:
    9.73  // ----------------------------------------------------------------------------
    9.74  static CMPIStatus ReferenceNames(
    9.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    9.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    9.77 -		CMPIResult * results,		/* [out] Results of this operation. */
    9.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    9.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    9.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
    9.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
    9.82  		const char *assocClass, 
    9.83  		const char *role)
    9.84  {
    9.85 @@ -403,12 +402,12 @@ exit:
    9.86  // ----------------------------------------------------------------------------
    9.87  static CMPIStatus References(
    9.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
    9.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
    9.90 -		CMPIResult * results,		/* [out] Results of this operation. */
    9.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    9.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
    9.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
    9.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
    9.95  		const char *assocClass,
    9.96  		const char *role,
    9.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
    9.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
    9.99  {
   9.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   9.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   9.102 @@ -518,15 +517,13 @@ exit:
   9.103  // ----------------------------------------------------------------------------
   9.104  static void AssociationInitialize(
   9.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   9.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   9.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   9.108  {
   9.109     _SBLIM_ENTER("AssociationInitialize");
   9.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
   9.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   9.112  
   9.113     /* Nothing needs to be done to initialize this provider */
   9.114 -
   9.115 -exit:
   9.116     _SBLIM_RETURN();
   9.117  }
   9.118  
    10.1 --- a/src/Xen_ComputerSystemNetworkPort.c	Fri Oct 20 13:20:15 2006 -0600
    10.2 +++ b/src/Xen_ComputerSystemNetworkPort.c	Tue Oct 24 11:30:03 2006 -0600
    10.3 @@ -15,7 +15,7 @@
    10.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    10.5  // ============================================================================
    10.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    10.7 -// Contributors:
    10.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    10.9  // Description:
   10.10  // ============================================================================
   10.11  
   10.12 @@ -32,7 +32,7 @@
   10.13  // ----------------------------------------------------------------------------
   10.14  
   10.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   10.16 -static CMPIBroker *_BROKER;
   10.17 +static const CMPIBroker *_BROKER;
   10.18  
   10.19  /* Include utility functions */
   10.20  #include "cmpiutil.h"
   10.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "Name";
   10.22  // ----------------------------------------------------------------------------
   10.23  static CMPIStatus AssociationCleanup(
   10.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   10.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   10.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   10.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   10.28  {
   10.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   10.30  
   10.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   10.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   10.33  
   10.34     /* Nothing needs to be done for cleanup. */
   10.35 -
   10.36 -exit:
   10.37     _SBLIM_RETURNSTATUS(status);
   10.38  }
   10.39  
   10.40 @@ -84,9 +83,9 @@ exit:
   10.41  // ----------------------------------------------------------------------------
   10.42  static CMPIStatus AssociatorNames(
   10.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   10.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   10.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   10.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   10.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   10.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   10.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   10.50  		const char * assocClass,
   10.51  		const char * resultClass,
   10.52  		const char * role,
   10.53 @@ -185,14 +184,14 @@ exit:
   10.54  // ----------------------------------------------------------------------------
   10.55  static CMPIStatus Associators(
   10.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   10.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   10.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   10.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   10.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   10.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   10.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   10.63  		const char *assocClass,
   10.64  		const char *resultClass,
   10.65  		const char *role,
   10.66  		const char *resultRole,
   10.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   10.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   10.69  {
   10.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   10.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   10.72 @@ -290,9 +289,9 @@ exit:
   10.73  // ----------------------------------------------------------------------------
   10.74  static CMPIStatus ReferenceNames(
   10.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   10.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   10.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   10.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   10.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   10.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   10.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   10.82  		const char *assocClass, 
   10.83  		const char *role)
   10.84  {
   10.85 @@ -403,12 +402,12 @@ exit:
   10.86  // ----------------------------------------------------------------------------
   10.87  static CMPIStatus References(
   10.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   10.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   10.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   10.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   10.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   10.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   10.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   10.95  		const char *assocClass,
   10.96  		const char *role,
   10.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   10.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   10.99  {
  10.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  10.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  10.102 @@ -518,15 +517,13 @@ exit:
  10.103  // ----------------------------------------------------------------------------
  10.104  static void AssociationInitialize(
  10.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  10.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  10.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  10.108  {
  10.109     _SBLIM_ENTER("AssociationInitialize");
  10.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  10.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  10.112  
  10.113     /* Nothing needs to be done to initialize this provider */
  10.114 -
  10.115 -exit:
  10.116     _SBLIM_RETURN();
  10.117  }
  10.118  
    11.1 --- a/src/Xen_ComputerSystemProcessor.c	Fri Oct 20 13:20:15 2006 -0600
    11.2 +++ b/src/Xen_ComputerSystemProcessor.c	Tue Oct 24 11:30:03 2006 -0600
    11.3 @@ -15,7 +15,7 @@
    11.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    11.5  // ============================================================================
    11.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    11.7 -// Contributors:
    11.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    11.9  // Description:
   11.10  // ============================================================================
   11.11  
   11.12 @@ -32,7 +32,7 @@
   11.13  // ----------------------------------------------------------------------------
   11.14  
   11.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   11.16 -static CMPIBroker *_BROKER;
   11.17 +static const CMPIBroker *_BROKER;
   11.18  
   11.19  /* Include utility functions */
   11.20  #include "cmpiutil.h"
   11.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "Name";
   11.22  // ----------------------------------------------------------------------------
   11.23  static CMPIStatus AssociationCleanup(
   11.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   11.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   11.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   11.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   11.28  {
   11.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   11.30  
   11.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   11.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   11.33  
   11.34     /* Nothing needs to be done for cleanup. */
   11.35 -
   11.36 -exit:
   11.37     _SBLIM_RETURNSTATUS(status);
   11.38  }
   11.39  
   11.40 @@ -84,9 +83,9 @@ exit:
   11.41  // ----------------------------------------------------------------------------
   11.42  static CMPIStatus AssociatorNames(
   11.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   11.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   11.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   11.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   11.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   11.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   11.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   11.50  		const char * assocClass,
   11.51  		const char * resultClass,
   11.52  		const char * role,
   11.53 @@ -185,14 +184,14 @@ exit:
   11.54  // ----------------------------------------------------------------------------
   11.55  static CMPIStatus Associators(
   11.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   11.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   11.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   11.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   11.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   11.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   11.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   11.63  		const char *assocClass,
   11.64  		const char *resultClass,
   11.65  		const char *role,
   11.66  		const char *resultRole,
   11.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   11.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   11.69  {
   11.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   11.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   11.72 @@ -290,9 +289,9 @@ exit:
   11.73  // ----------------------------------------------------------------------------
   11.74  static CMPIStatus ReferenceNames(
   11.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   11.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   11.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   11.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   11.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   11.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   11.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   11.82  		const char *assocClass, 
   11.83  		const char *role)
   11.84  {
   11.85 @@ -403,12 +402,12 @@ exit:
   11.86  // ----------------------------------------------------------------------------
   11.87  static CMPIStatus References(
   11.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   11.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   11.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   11.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   11.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   11.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   11.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   11.95  		const char *assocClass,
   11.96  		const char *role,
   11.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   11.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   11.99  {
  11.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  11.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  11.102 @@ -518,15 +517,13 @@ exit:
  11.103  // ----------------------------------------------------------------------------
  11.104  static void AssociationInitialize(
  11.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  11.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  11.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  11.108  {
  11.109     _SBLIM_ENTER("AssociationInitialize");
  11.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  11.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  11.112  
  11.113     /* Nothing needs to be done to initialize this provider */
  11.114 -
  11.115 -exit:
  11.116     _SBLIM_RETURN();
  11.117  }
  11.118  
    12.1 --- a/src/Xen_ComputerSystemSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    12.2 +++ b/src/Xen_ComputerSystemSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    12.3 @@ -15,7 +15,7 @@
    12.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    12.5  // ============================================================================
    12.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    12.7 -// Contributors:
    12.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    12.9  // Description:
   12.10  // ============================================================================
   12.11  
   12.12 @@ -30,7 +30,7 @@
   12.13  // ----------------------------------------------------------------------------
   12.14  
   12.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   12.16 -static CMPIBroker *_BROKER;
   12.17 +static const CMPIBroker *_BROKER;
   12.18  
   12.19  /* Include utility functions */
   12.20  #include "cmpiutil.h"
   12.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   12.22  // ----------------------------------------------------------------------------
   12.23  static CMPIStatus Cleanup(
   12.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   12.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   12.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   12.28  {
   12.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   12.30  
   12.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   12.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   12.33  
   12.34     /* Nothing needs to be done for cleanup. */
   12.35 -
   12.36 -exit:
   12.37     _SBLIM_RETURNSTATUS(status);
   12.38  }
   12.39  
   12.40 @@ -84,9 +83,9 @@ exit:
   12.41  // ----------------------------------------------------------------------------
   12.42  static CMPIStatus EnumInstanceNames(
   12.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   12.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   12.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   12.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   12.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   12.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   12.50  {
   12.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   12.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   12.53 @@ -164,9 +163,9 @@ exit:
   12.54  // ----------------------------------------------------------------------------
   12.55  static CMPIStatus EnumInstances(
   12.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   12.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   12.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   12.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   12.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   12.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   12.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   12.64  {
   12.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   12.66 @@ -245,9 +244,9 @@ exit:
   12.67  // ----------------------------------------------------------------------------
   12.68  static CMPIStatus GetInstance(
   12.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   12.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   12.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   12.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   12.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   12.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   12.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   12.77  {
   12.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   12.79 @@ -330,10 +329,11 @@ exit:
   12.80  // ----------------------------------------------------------------------------
   12.81  static CMPIStatus SetInstance(
   12.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   12.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   12.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   12.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   12.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   12.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   12.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   12.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   12.91 +        const char **properties)
   12.92  {
   12.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   12.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   12.95 @@ -402,10 +402,10 @@ exit:
   12.96  // ----------------------------------------------------------------------------
   12.97  static CMPIStatus CreateInstance(
   12.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   12.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  12.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  12.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  12.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  12.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  12.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  12.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  12.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  12.107  {
  12.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  12.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  12.110 @@ -481,9 +481,9 @@ exit:
  12.111  // ----------------------------------------------------------------------------
  12.112  static CMPIStatus DeleteInstance(
  12.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  12.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  12.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  12.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  12.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  12.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  12.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  12.120  {
  12.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  12.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  12.123 @@ -552,11 +552,11 @@ exit:
  12.124  // ----------------------------------------------------------------------------
  12.125  static CMPIStatus ExecQuery(
  12.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  12.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  12.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  12.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  12.130 -		char * language,		/* [in] Name of the query language. */
  12.131 -		char * query)			/* [in] Text of the query written in the query language. */
  12.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  12.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  12.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  12.135 +		const char * language,		/* [in] Name of the query language. */
  12.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  12.137  {
  12.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  12.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  12.140 @@ -585,15 +585,13 @@ exit:
  12.141  // ----------------------------------------------------------------------------
  12.142  static void Initialize(
  12.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  12.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  12.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  12.146  {
  12.147     _SBLIM_ENTER("Initialize");
  12.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  12.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  12.150  
  12.151     /* Nothing needs to be done to initialize this provider */
  12.152 -
  12.153 -exit:
  12.154     _SBLIM_RETURN();
  12.155  }
  12.156  
    13.1 --- a/src/Xen_ComputerSystemSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    13.2 +++ b/src/Xen_ComputerSystemSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    13.3 @@ -15,7 +15,7 @@
    13.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    13.5  // ============================================================================
    13.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    13.7 -// Contributors:
    13.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    13.9  // Description:
   13.10  // ============================================================================
   13.11  
   13.12 @@ -108,7 +108,7 @@ int Xen_ComputerSystemSettingData_getNex
   13.13  // ----------------------------------------------------------------------------
   13.14  
   13.15  /* Get the specific resource that matches the CMPI object path. */
   13.16 -int Xen_ComputerSystemSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   13.17 +int Xen_ComputerSystemSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   13.18  {
   13.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   13.20  
   13.21 @@ -148,7 +148,7 @@ int Xen_ComputerSystemSettingData_freeRe
   13.22  // ---------------------------------------------------------------------------- 
   13.23  
   13.24  /* Set the property values of a CMPI instance from a specific resource. */
   13.25 -int Xen_ComputerSystemSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   13.26 +int Xen_ComputerSystemSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   13.27  {
   13.28     int i;
   13.29     int instIdLen;
   13.30 @@ -224,7 +224,7 @@ int Xen_ComputerSystemSettingData_delete
   13.31  // ----------------------------------------------------------------------------
   13.32  
   13.33  /* Modify the specified resource using the property values of a CMPI instance. */
   13.34 -int Xen_ComputerSystemSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   13.35 +int Xen_ComputerSystemSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   13.36  {
   13.37     /* Unsupported. */
   13.38     return -1;
   13.39 @@ -233,7 +233,7 @@ int Xen_ComputerSystemSettingData_setRes
   13.40  // ----------------------------------------------------------------------------
   13.41  
   13.42  /* Create a new resource using the property values of a CMPI instance. */
   13.43 -int Xen_ComputerSystemSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   13.44 +int Xen_ComputerSystemSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   13.45  {
   13.46     /* Unsupported. */
   13.47     return -1;
    14.1 --- a/src/Xen_ComputerSystemSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    14.2 +++ b/src/Xen_ComputerSystemSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    14.3 @@ -15,7 +15,7 @@
    14.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    14.5  // ============================================================================
    14.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    14.7 -// Contributors:
    14.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    14.9  // Description:
   14.10  // ============================================================================
   14.11  
   14.12 @@ -66,13 +66,13 @@ int Xen_ComputerSystemSettingData_freeRe
   14.13  int Xen_ComputerSystemSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   14.14  
   14.15  /* Get the specific resource that matches the CMPI object path. */
   14.16 -int Xen_ComputerSystemSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   14.17 +int Xen_ComputerSystemSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   14.18  
   14.19  /* Free/deallocate/cleanup a resource after use. */
   14.20  int Xen_ComputerSystemSettingData_freeResource( _RESOURCE * resource );
   14.21  
   14.22  /* Set the property values of a CMPI instance from a specific resource. */
   14.23 -int Xen_ComputerSystemSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   14.24 +int Xen_ComputerSystemSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   14.25  
   14.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   14.27  
   14.28 @@ -80,8 +80,8 @@ int Xen_ComputerSystemSettingData_setIns
   14.29  int Xen_ComputerSystemSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   14.30  
   14.31  /* Modify the specified resource using the property values of a CMPI instance. */
   14.32 -int Xen_ComputerSystemSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   14.33 +int Xen_ComputerSystemSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   14.34  
   14.35  /* Create a new resource using the property values of a CMPI instance. */
   14.36 -int Xen_ComputerSystemSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   14.37 +int Xen_ComputerSystemSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   14.38  
    15.1 --- a/src/Xen_ComputerSystem_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    15.2 +++ b/src/Xen_ComputerSystem_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    15.3 @@ -105,7 +105,7 @@ int Xen_ComputerSystem_getNextResource( 
    15.4  // ----------------------------------------------------------------------------
    15.5  
    15.6  /* Get the specific resource that matches the CMPI object path. */
    15.7 -int Xen_ComputerSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
    15.8 +int Xen_ComputerSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
    15.9  {
   15.10     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   15.11  
   15.12 @@ -143,7 +143,7 @@ int Xen_ComputerSystem_freeResource( _RE
   15.13  // ---------------------------------------------------------------------------- 
   15.14  
   15.15  /* Set the property values of a CMPI instance from a specific resource. */
   15.16 -int Xen_ComputerSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   15.17 +int Xen_ComputerSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, const CMPIBroker * broker )
   15.18  {
   15.19     CMPIArray * status = CMNewArray(broker, 1, CMPI_uint16, NULL);
   15.20     int statusvalue;
   15.21 @@ -265,7 +265,7 @@ int Xen_ComputerSystem_deleteResource( _
   15.22  // ----------------------------------------------------------------------------
   15.23  
   15.24  /* Modify the specified resource using the property values of a CMPI instance. */
   15.25 -int Xen_ComputerSystem_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   15.26 +int Xen_ComputerSystem_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   15.27  {
   15.28     /* Unsupported. */
   15.29     return -1;
   15.30 @@ -274,7 +274,7 @@ int Xen_ComputerSystem_setResourceFromIn
   15.31  // ----------------------------------------------------------------------------
   15.32  
   15.33  /* Create a new resource using the property values of a CMPI instance. */
   15.34 -int Xen_ComputerSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   15.35 +int Xen_ComputerSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   15.36  {
   15.37     /* Unsupported. */
   15.38     return -1;
    16.1 --- a/src/Xen_ComputerSystem_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    16.2 +++ b/src/Xen_ComputerSystem_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    16.3 @@ -67,13 +67,13 @@ int Xen_ComputerSystem_freeResources( _R
    16.4  int Xen_ComputerSystem_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
    16.5  
    16.6  /* Get the specific resource that matches the CMPI object path. */
    16.7 -int Xen_ComputerSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
    16.8 +int Xen_ComputerSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
    16.9  
   16.10  /* Free/deallocate/cleanup a resource after use. */
   16.11  int Xen_ComputerSystem_freeResource( _RESOURCE * resource );
   16.12  
   16.13  /* Set the property values of a CMPI instance from a specific resource. */
   16.14 -int Xen_ComputerSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   16.15 +int Xen_ComputerSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, const CMPIBroker * broker );
   16.16  
   16.17  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   16.18  
   16.19 @@ -81,8 +81,8 @@ int Xen_ComputerSystem_setInstanceFromRe
   16.20  int Xen_ComputerSystem_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   16.21  
   16.22  /* Modify the specified resource using the property values of a CMPI instance. */
   16.23 -int Xen_ComputerSystem_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   16.24 +int Xen_ComputerSystem_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   16.25  
   16.26  /* Create a new resource using the property values of a CMPI instance. */
   16.27 -int Xen_ComputerSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   16.28 +int Xen_ComputerSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   16.29  
    17.1 --- a/src/Xen_Disk.c	Fri Oct 20 13:20:15 2006 -0600
    17.2 +++ b/src/Xen_Disk.c	Tue Oct 24 11:30:03 2006 -0600
    17.3 @@ -16,7 +16,7 @@
    17.4  // ============================================================================
    17.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    17.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    17.7 -// Contributors:
    17.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    17.9  // Description:
   17.10  // ============================================================================
   17.11  
   17.12 @@ -31,7 +31,7 @@
   17.13  // ----------------------------------------------------------------------------
   17.14  
   17.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   17.16 -static CMPIBroker *_BROKER;
   17.17 +static const CMPIBroker *_BROKER;
   17.18  
   17.19  /* Include utility functions */
   17.20  #include "cmpiutil.h"
   17.21 @@ -65,7 +65,8 @@ const static char * _KEYNAMES[] = {"Syst
   17.22  // ----------------------------------------------------------------------------
   17.23  static CMPIStatus Cleanup(
   17.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   17.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   17.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   17.28  {
   17.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   17.30  
   17.31 @@ -74,8 +75,6 @@ static CMPIStatus Cleanup(
   17.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   17.33  
   17.34     /* Nothing needs to be done for cleanup. */
   17.35 -
   17.36 -exit:
   17.37     _SBLIM_RETURNSTATUS(status);
   17.38  }
   17.39  
   17.40 @@ -85,9 +84,9 @@ exit:
   17.41  // ----------------------------------------------------------------------------
   17.42  static CMPIStatus EnumInstanceNames(
   17.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   17.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   17.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   17.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   17.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   17.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   17.50  {
   17.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   17.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   17.53 @@ -165,9 +164,9 @@ exit:
   17.54  // ----------------------------------------------------------------------------
   17.55  static CMPIStatus EnumInstances(
   17.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   17.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   17.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   17.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   17.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   17.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   17.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   17.64  {
   17.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   17.66 @@ -246,9 +245,9 @@ exit:
   17.67  // ----------------------------------------------------------------------------
   17.68  static CMPIStatus GetInstance(
   17.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   17.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   17.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   17.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   17.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   17.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   17.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   17.77  {
   17.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   17.79 @@ -331,10 +330,11 @@ exit:
   17.80  // ----------------------------------------------------------------------------
   17.81  static CMPIStatus SetInstance(
   17.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   17.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   17.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   17.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   17.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   17.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   17.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   17.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   17.91 +        const char **properties)
   17.92  {
   17.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   17.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   17.95 @@ -403,10 +403,10 @@ exit:
   17.96  // ----------------------------------------------------------------------------
   17.97  static CMPIStatus CreateInstance(
   17.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   17.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  17.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  17.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  17.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  17.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  17.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  17.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  17.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  17.107  {
  17.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  17.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  17.110 @@ -482,9 +482,9 @@ exit:
  17.111  // ----------------------------------------------------------------------------
  17.112  static CMPIStatus DeleteInstance(
  17.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  17.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  17.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  17.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  17.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  17.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  17.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  17.120  {
  17.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  17.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  17.123 @@ -553,11 +553,11 @@ exit:
  17.124  // ----------------------------------------------------------------------------
  17.125  static CMPIStatus ExecQuery(
  17.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  17.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  17.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  17.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  17.130 -		char * language,		/* [in] Name of the query language. */
  17.131 -		char * query)			/* [in] Text of the query written in the query language. */
  17.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  17.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  17.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  17.135 +		const char * language,		/* [in] Name of the query language. */
  17.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  17.137  {
  17.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  17.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  17.140 @@ -586,15 +586,13 @@ exit:
  17.141  // ----------------------------------------------------------------------------
  17.142  static void Initialize(
  17.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  17.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  17.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  17.146  {
  17.147     _SBLIM_ENTER("Initialize");
  17.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  17.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  17.150  
  17.151     /* Nothing needs to be done to initialize this provider */
  17.152 -
  17.153 -exit:
  17.154     _SBLIM_RETURN();
  17.155  }
  17.156  
    18.1 --- a/src/Xen_DiskElementSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    18.2 +++ b/src/Xen_DiskElementSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    18.3 @@ -15,7 +15,7 @@
    18.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    18.5  // ============================================================================
    18.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    18.7 -// Contributors:
    18.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    18.9  // Description:
   18.10  // ============================================================================
   18.11  
   18.12 @@ -32,7 +32,7 @@
   18.13  // ----------------------------------------------------------------------------
   18.14  
   18.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   18.16 -static CMPIBroker *_BROKER;
   18.17 +static const CMPIBroker *_BROKER;
   18.18  
   18.19  /* Include utility functions */
   18.20  #include "cmpiutil.h"
   18.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "SystemName"
   18.22  // ----------------------------------------------------------------------------
   18.23  static CMPIStatus AssociationCleanup(
   18.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   18.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   18.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   18.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   18.28  {
   18.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   18.30  
   18.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   18.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   18.33  
   18.34     /* Nothing needs to be done for cleanup. */
   18.35 -
   18.36 -exit:
   18.37     _SBLIM_RETURNSTATUS(status);
   18.38  }
   18.39  
   18.40 @@ -84,9 +83,9 @@ exit:
   18.41  // ----------------------------------------------------------------------------
   18.42  static CMPIStatus AssociatorNames(
   18.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   18.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   18.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   18.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   18.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   18.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   18.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   18.50  		const char * assocClass,
   18.51  		const char * resultClass,
   18.52  		const char * role,
   18.53 @@ -185,14 +184,14 @@ exit:
   18.54  // ----------------------------------------------------------------------------
   18.55  static CMPIStatus Associators(
   18.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   18.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   18.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   18.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   18.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   18.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   18.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   18.63  		const char *assocClass,
   18.64  		const char *resultClass,
   18.65  		const char *role,
   18.66  		const char *resultRole,
   18.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   18.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   18.69  {
   18.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   18.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   18.72 @@ -290,9 +289,9 @@ exit:
   18.73  // ----------------------------------------------------------------------------
   18.74  static CMPIStatus ReferenceNames(
   18.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   18.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   18.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   18.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   18.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   18.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   18.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   18.82  		const char *assocClass, 
   18.83  		const char *role)
   18.84  {
   18.85 @@ -403,12 +402,12 @@ exit:
   18.86  // ----------------------------------------------------------------------------
   18.87  static CMPIStatus References(
   18.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   18.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   18.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   18.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   18.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   18.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   18.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   18.95  		const char *assocClass,
   18.96  		const char *role,
   18.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   18.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   18.99  {
  18.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  18.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  18.102 @@ -518,15 +517,13 @@ exit:
  18.103  // ----------------------------------------------------------------------------
  18.104  static void AssociationInitialize(
  18.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  18.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  18.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  18.108  {
  18.109     _SBLIM_ENTER("AssociationInitialize");
  18.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  18.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  18.112  
  18.113     /* Nothing needs to be done to initialize this provider */
  18.114 -
  18.115 -exit:
  18.116     _SBLIM_RETURN();
  18.117  }
  18.118  
    19.1 --- a/src/Xen_DiskSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    19.2 +++ b/src/Xen_DiskSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    19.3 @@ -15,7 +15,7 @@
    19.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    19.5  // ============================================================================
    19.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    19.7 -// Contributors:
    19.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    19.9  // Description:
   19.10  // ============================================================================
   19.11  
   19.12 @@ -30,7 +30,7 @@
   19.13  // ----------------------------------------------------------------------------
   19.14  
   19.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   19.16 -static CMPIBroker *_BROKER;
   19.17 +static const CMPIBroker *_BROKER;
   19.18  
   19.19  /* Include utility functions */
   19.20  #include "cmpiutil.h"
   19.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   19.22  // ----------------------------------------------------------------------------
   19.23  static CMPIStatus Cleanup(
   19.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   19.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   19.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   19.28  {
   19.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   19.30  
   19.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   19.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   19.33  
   19.34     /* Nothing needs to be done for cleanup. */
   19.35 -
   19.36 -exit:
   19.37     _SBLIM_RETURNSTATUS(status);
   19.38  }
   19.39  
   19.40 @@ -84,9 +83,9 @@ exit:
   19.41  // ----------------------------------------------------------------------------
   19.42  static CMPIStatus EnumInstanceNames(
   19.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   19.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   19.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   19.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   19.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   19.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   19.50  {
   19.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   19.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   19.53 @@ -164,9 +163,9 @@ exit:
   19.54  // ----------------------------------------------------------------------------
   19.55  static CMPIStatus EnumInstances(
   19.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   19.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   19.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   19.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   19.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   19.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   19.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   19.64  {
   19.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   19.66 @@ -245,9 +244,9 @@ exit:
   19.67  // ----------------------------------------------------------------------------
   19.68  static CMPIStatus GetInstance(
   19.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   19.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   19.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   19.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   19.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   19.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   19.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   19.77  {
   19.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   19.79 @@ -330,10 +329,11 @@ exit:
   19.80  // ----------------------------------------------------------------------------
   19.81  static CMPIStatus SetInstance(
   19.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   19.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   19.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   19.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   19.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   19.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   19.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   19.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   19.91 +        const char **properties)
   19.92  {
   19.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   19.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   19.95 @@ -402,10 +402,10 @@ exit:
   19.96  // ----------------------------------------------------------------------------
   19.97  static CMPIStatus CreateInstance(
   19.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   19.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  19.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  19.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  19.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  19.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  19.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  19.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  19.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  19.107  {
  19.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  19.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  19.110 @@ -481,9 +481,9 @@ exit:
  19.111  // ----------------------------------------------------------------------------
  19.112  static CMPIStatus DeleteInstance(
  19.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  19.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  19.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  19.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  19.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  19.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  19.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  19.120  {
  19.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  19.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  19.123 @@ -552,11 +552,11 @@ exit:
  19.124  // ----------------------------------------------------------------------------
  19.125  static CMPIStatus ExecQuery(
  19.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  19.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  19.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  19.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  19.130 -		char * language,		/* [in] Name of the query language. */
  19.131 -		char * query)			/* [in] Text of the query written in the query language. */
  19.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  19.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  19.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  19.135 +		const char * language,		/* [in] Name of the query language. */
  19.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  19.137  {
  19.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  19.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  19.140 @@ -585,15 +585,13 @@ exit:
  19.141  // ----------------------------------------------------------------------------
  19.142  static void Initialize(
  19.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  19.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  19.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  19.146  {
  19.147     _SBLIM_ENTER("Initialize");
  19.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  19.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  19.150  
  19.151     /* Nothing needs to be done to initialize this provider */
  19.152 -
  19.153 -exit:
  19.154     _SBLIM_RETURN();
  19.155  }
  19.156  
    20.1 --- a/src/Xen_DiskSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    20.2 +++ b/src/Xen_DiskSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    20.3 @@ -16,7 +16,7 @@
    20.4  // ============================================================================
    20.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    20.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    20.7 -// Contributors:
    20.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    20.9  // Description:
   20.10  // ============================================================================
   20.11  
   20.12 @@ -109,7 +109,7 @@ int Xen_DiskSettingData_getNextResource(
   20.13  // ----------------------------------------------------------------------------
   20.14  
   20.15  /* Get the specific resource that matches the CMPI object path. */
   20.16 -int Xen_DiskSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   20.17 +int Xen_DiskSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   20.18  {
   20.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   20.20  
   20.21 @@ -149,7 +149,7 @@ int Xen_DiskSettingData_freeResource( _R
   20.22  // ---------------------------------------------------------------------------- 
   20.23  
   20.24  /* Set the property values of a CMPI instance from a specific resource. */
   20.25 -int Xen_DiskSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   20.26 +int Xen_DiskSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   20.27  {
   20.28     int i;
   20.29     int instIdLen;
   20.30 @@ -210,7 +210,7 @@ int Xen_DiskSettingData_deleteResource( 
   20.31  // ----------------------------------------------------------------------------
   20.32  
   20.33  /* Modify the specified resource using the property values of a CMPI instance. */
   20.34 -int Xen_DiskSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   20.35 +int Xen_DiskSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   20.36  {
   20.37     /* Unsupported. */
   20.38     return -1;
   20.39 @@ -219,7 +219,7 @@ int Xen_DiskSettingData_setResourceFromI
   20.40  // ----------------------------------------------------------------------------
   20.41  
   20.42  /* Create a new resource using the property values of a CMPI instance. */
   20.43 -int Xen_DiskSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   20.44 +int Xen_DiskSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   20.45  {
   20.46     /* Unsupported. */
   20.47     return -1;
    21.1 --- a/src/Xen_DiskSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    21.2 +++ b/src/Xen_DiskSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    21.3 @@ -16,7 +16,7 @@
    21.4  // ============================================================================
    21.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    21.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    21.7 -// Contributors:
    21.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    21.9  // Description:
   21.10  // ============================================================================
   21.11  
   21.12 @@ -67,13 +67,13 @@ int Xen_DiskSettingData_freeResources( _
   21.13  int Xen_DiskSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   21.14  
   21.15  /* Get the specific resource that matches the CMPI object path. */
   21.16 -int Xen_DiskSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   21.17 +int Xen_DiskSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   21.18  
   21.19  /* Free/deallocate/cleanup a resource after use. */
   21.20  int Xen_DiskSettingData_freeResource( _RESOURCE * resource );
   21.21  
   21.22  /* Set the property values of a CMPI instance from a specific resource. */
   21.23 -int Xen_DiskSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   21.24 +int Xen_DiskSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   21.25  
   21.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   21.27  
   21.28 @@ -81,8 +81,8 @@ int Xen_DiskSettingData_setInstanceFromR
   21.29  int Xen_DiskSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   21.30  
   21.31  /* Modify the specified resource using the property values of a CMPI instance. */
   21.32 -int Xen_DiskSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   21.33 +int Xen_DiskSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   21.34  
   21.35  /* Create a new resource using the property values of a CMPI instance. */
   21.36 -int Xen_DiskSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   21.37 +int Xen_DiskSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   21.38  
    22.1 --- a/src/Xen_Disk_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    22.2 +++ b/src/Xen_Disk_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    22.3 @@ -16,7 +16,7 @@
    22.4  // ============================================================================
    22.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    22.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    22.7 -// Contributors:
    22.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    22.9  // Description:
   22.10  // ============================================================================
   22.11  
   22.12 @@ -112,7 +112,7 @@ int Xen_Disk_getNextResource( _RESOURCES
   22.13  // ----------------------------------------------------------------------------
   22.14  
   22.15  /* Get the specific resource that matches the CMPI object path. */
   22.16 -int Xen_Disk_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   22.17 +int Xen_Disk_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   22.18  {
   22.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   22.20  
   22.21 @@ -150,7 +150,7 @@ int Xen_Disk_freeResource( _RESOURCE * r
   22.22  // ---------------------------------------------------------------------------- 
   22.23  
   22.24  /* Set the property values of a CMPI instance from a specific resource. */
   22.25 -int Xen_Disk_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   22.26 +int Xen_Disk_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   22.27  {
   22.28     if (resource == NULL) return 0;
   22.29     if (CMIsNullObject(instance)) return 0;
   22.30 @@ -206,7 +206,7 @@ int Xen_Disk_deleteResource( _RESOURCES 
   22.31  // ----------------------------------------------------------------------------
   22.32  
   22.33  /* Modify the specified resource using the property values of a CMPI instance. */
   22.34 -int Xen_Disk_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   22.35 +int Xen_Disk_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   22.36  {
   22.37     /* Unsupported. */
   22.38     return -1;
   22.39 @@ -215,7 +215,7 @@ int Xen_Disk_setResourceFromInstance( _R
   22.40  // ----------------------------------------------------------------------------
   22.41  
   22.42  /* Create a new resource using the property values of a CMPI instance. */
   22.43 -int Xen_Disk_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   22.44 +int Xen_Disk_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   22.45  {
   22.46     /* Unsupported. */
   22.47     return -1;
    23.1 --- a/src/Xen_Disk_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    23.2 +++ b/src/Xen_Disk_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    23.3 @@ -16,7 +16,7 @@
    23.4  // ============================================================================
    23.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    23.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    23.7 -// Contributors:
    23.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    23.9  // Description:
   23.10  // ============================================================================
   23.11  
   23.12 @@ -68,13 +68,13 @@ int Xen_Disk_freeResources( _RESOURCES *
   23.13  int Xen_Disk_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   23.14  
   23.15  /* Get the specific resource that matches the CMPI object path. */
   23.16 -int Xen_Disk_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   23.17 +int Xen_Disk_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   23.18  
   23.19  /* Free/deallocate/cleanup a resource after use. */
   23.20  int Xen_Disk_freeResource( _RESOURCE * resource );
   23.21  
   23.22  /* Set the property values of a CMPI instance from a specific resource. */
   23.23 -int Xen_Disk_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   23.24 +int Xen_Disk_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   23.25  
   23.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   23.27  
   23.28 @@ -82,8 +82,8 @@ int Xen_Disk_setInstanceFromResource( _R
   23.29  int Xen_Disk_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   23.30  
   23.31  /* Modify the specified resource using the property values of a CMPI instance. */
   23.32 -int Xen_Disk_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   23.33 +int Xen_Disk_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   23.34  
   23.35  /* Create a new resource using the property values of a CMPI instance. */
   23.36 -int Xen_Disk_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   23.37 +int Xen_Disk_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   23.38  
    24.1 --- a/src/Xen_ElementConformsToSVProfile.c	Fri Oct 20 13:20:15 2006 -0600
    24.2 +++ b/src/Xen_ElementConformsToSVProfile.c	Tue Oct 24 11:30:03 2006 -0600
    24.3 @@ -33,7 +33,7 @@
    24.4  // ----------------------------------------------------------------------------
    24.5  
    24.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    24.7 -static CMPIBroker *_BROKER;
    24.8 +static const CMPIBroker *_BROKER;
    24.9  
   24.10  /* Include utility functions */
   24.11  #include "cmpiutil.h"
   24.12 @@ -65,7 +65,8 @@ static char * _RHSNAMESPACE = "smash";
   24.13  // ----------------------------------------------------------------------------
   24.14  static CMPIStatus AssociationCleanup(
   24.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   24.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   24.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   24.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   24.19  {
   24.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   24.21  
   24.22 @@ -74,8 +75,6 @@ static CMPIStatus AssociationCleanup(
   24.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   24.24  
   24.25     /* Nothing needs to be done for cleanup. */
   24.26 -
   24.27 -exit:
   24.28     _SBLIM_RETURNSTATUS(status);
   24.29  }
   24.30  
   24.31 @@ -85,9 +84,9 @@ exit:
   24.32  // ----------------------------------------------------------------------------
   24.33  static CMPIStatus AssociatorNames(
   24.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   24.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   24.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   24.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   24.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   24.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   24.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   24.41  		const char * assocClass,
   24.42  		const char * resultClass,
   24.43  		const char * role,
   24.44 @@ -180,14 +179,14 @@ exit:
   24.45  // ----------------------------------------------------------------------------
   24.46  static CMPIStatus Associators(
   24.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   24.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   24.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   24.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   24.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   24.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   24.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   24.54  		const char *assocClass,
   24.55  		const char *resultClass,
   24.56  		const char *role,
   24.57  		const char *resultRole,
   24.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   24.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   24.60  {
   24.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   24.62     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
   24.63 @@ -278,9 +277,9 @@ exit:
   24.64  // ----------------------------------------------------------------------------
   24.65  static CMPIStatus ReferenceNames(
   24.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   24.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   24.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   24.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   24.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   24.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   24.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   24.73  		const char *resultClass, 
   24.74  		const char *role)
   24.75  {
   24.76 @@ -305,7 +304,7 @@ static CMPIStatus ReferenceNames(
   24.77        targetclass = _RHSCLASSNAME;
   24.78        targetnamespace = _RHSNAMESPACE;
   24.79        /* Refences of LHS class should always be in LHS namespace. */
   24.80 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   24.81 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   24.82     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   24.83        targetclass = _LHSCLASSNAME;
   24.84        targetnamespace = _LHSNAMESPACE;
   24.85 @@ -390,12 +389,12 @@ exit:
   24.86  // ----------------------------------------------------------------------------
   24.87  static CMPIStatus References(
   24.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   24.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   24.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   24.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   24.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   24.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   24.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   24.95  		const char *resultClass,
   24.96  		const char *role,
   24.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   24.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   24.99  {
  24.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  24.101     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
  24.102 @@ -418,7 +417,7 @@ static CMPIStatus References(
  24.103        targetclass = _RHSCLASSNAME;
  24.104        targetnamespace = _RHSNAMESPACE;
  24.105        /* Refences of LHS class should always be in LHS namespace. */
  24.106 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  24.107 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  24.108     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  24.109        targetclass = _LHSCLASSNAME;
  24.110        targetnamespace = _LHSNAMESPACE;
  24.111 @@ -505,15 +504,13 @@ exit:
  24.112  // ----------------------------------------------------------------------------
  24.113  static void AssociationInitialize(
  24.114  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  24.115 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  24.116 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  24.117  {
  24.118     _SBLIM_ENTER("AssociationInitialize");
  24.119     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  24.120     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  24.121  
  24.122     /* Nothing needs to be done to initialize this provider */
  24.123 -
  24.124 -exit:
  24.125     _SBLIM_RETURN();
  24.126  }
  24.127  
    25.1 --- a/src/Xen_ElementConformsToVSProfile.c	Fri Oct 20 13:20:15 2006 -0600
    25.2 +++ b/src/Xen_ElementConformsToVSProfile.c	Tue Oct 24 11:30:03 2006 -0600
    25.3 @@ -33,7 +33,7 @@
    25.4  // ----------------------------------------------------------------------------
    25.5  
    25.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    25.7 -static CMPIBroker *_BROKER;
    25.8 +static const CMPIBroker *_BROKER;
    25.9  
   25.10  /* Include utility functions */
   25.11  #include "cmpiutil.h"
   25.12 @@ -65,7 +65,8 @@ static char * _RHSNAMESPACE = "root/cimv
   25.13  // ----------------------------------------------------------------------------
   25.14  static CMPIStatus AssociationCleanup(
   25.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   25.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   25.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   25.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   25.19  {
   25.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   25.21  
   25.22 @@ -74,8 +75,6 @@ static CMPIStatus AssociationCleanup(
   25.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   25.24  
   25.25     /* Nothing needs to be done for cleanup. */
   25.26 -
   25.27 -exit:
   25.28     _SBLIM_RETURNSTATUS(status);
   25.29  }
   25.30  
   25.31 @@ -85,9 +84,9 @@ exit:
   25.32  // ----------------------------------------------------------------------------
   25.33  static CMPIStatus AssociatorNames(
   25.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   25.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   25.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   25.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   25.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   25.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   25.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   25.41  		const char * assocClass,
   25.42  		const char * resultClass,
   25.43  		const char * role,
   25.44 @@ -180,14 +179,14 @@ exit:
   25.45  // ----------------------------------------------------------------------------
   25.46  static CMPIStatus Associators(
   25.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   25.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   25.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   25.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   25.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   25.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   25.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   25.54  		const char *assocClass,
   25.55  		const char *resultClass,
   25.56  		const char *role,
   25.57  		const char *resultRole,
   25.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   25.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   25.60  {
   25.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   25.62     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
   25.63 @@ -278,9 +277,9 @@ exit:
   25.64  // ----------------------------------------------------------------------------
   25.65  static CMPIStatus ReferenceNames(
   25.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   25.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   25.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   25.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   25.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   25.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   25.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   25.73  		const char *resultClass, 
   25.74  		const char *role)
   25.75  {
   25.76 @@ -305,7 +304,7 @@ static CMPIStatus ReferenceNames(
   25.77        targetclass = _RHSCLASSNAME;
   25.78        targetnamespace = _RHSNAMESPACE;
   25.79        /* Refences of LHS class should always be in LHS namespace. */
   25.80 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   25.81 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   25.82     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   25.83        targetclass = _LHSCLASSNAME;
   25.84        targetnamespace = _LHSNAMESPACE;
   25.85 @@ -390,12 +389,12 @@ exit:
   25.86  // ----------------------------------------------------------------------------
   25.87  static CMPIStatus References(
   25.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   25.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   25.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   25.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   25.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   25.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   25.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   25.95  		const char *resultClass,
   25.96  		const char *role,
   25.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   25.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   25.99  {
  25.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  25.101     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
  25.102 @@ -418,7 +417,7 @@ static CMPIStatus References(
  25.103        targetclass = _RHSCLASSNAME;
  25.104        targetnamespace = _RHSNAMESPACE;
  25.105        /* Refences of LHS class should always be in LHS namespace. */
  25.106 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  25.107 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  25.108     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  25.109        targetclass = _LHSCLASSNAME;
  25.110        targetnamespace = _LHSNAMESPACE;
  25.111 @@ -505,15 +504,13 @@ exit:
  25.112  // ----------------------------------------------------------------------------
  25.113  static void AssociationInitialize(
  25.114  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  25.115 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  25.116 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  25.117  {
  25.118     _SBLIM_ENTER("AssociationInitialize");
  25.119     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  25.120     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  25.121  
  25.122     /* Nothing needs to be done to initialize this provider */
  25.123 -
  25.124 -exit:
  25.125     _SBLIM_RETURN();
  25.126  }
  25.127  
    26.1 --- a/src/Xen_HasVirtualizationCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
    26.2 +++ b/src/Xen_HasVirtualizationCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
    26.3 @@ -15,7 +15,7 @@
    26.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    26.5  // ============================================================================
    26.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    26.7 -// Contributors:
    26.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    26.9  // Description:
   26.10  // ============================================================================
   26.11  
   26.12 @@ -32,7 +32,7 @@
   26.13  // ----------------------------------------------------------------------------
   26.14  
   26.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   26.16 -static CMPIBroker *_BROKER;
   26.17 +static const CMPIBroker *_BROKER;
   26.18  
   26.19  /* Include utility functions */
   26.20  #include "cmpiutil.h"
   26.21 @@ -62,7 +62,8 @@ static char * _RHSPROPERTYNAME = "Manage
   26.22  // ----------------------------------------------------------------------------
   26.23  static CMPIStatus AssociationCleanup(
   26.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   26.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   26.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   26.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   26.28  {
   26.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   26.30  
   26.31 @@ -71,8 +72,6 @@ static CMPIStatus AssociationCleanup(
   26.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   26.33  
   26.34     /* Nothing needs to be done for cleanup. */
   26.35 -
   26.36 -exit:
   26.37     _SBLIM_RETURNSTATUS(status);
   26.38  }
   26.39  
   26.40 @@ -82,9 +81,9 @@ exit:
   26.41  // ----------------------------------------------------------------------------
   26.42  static CMPIStatus AssociatorNames(
   26.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   26.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   26.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   26.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   26.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   26.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   26.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   26.50  		const char * assocClass,
   26.51  		const char * resultClass,
   26.52  		const char * role,
   26.53 @@ -169,14 +168,14 @@ exit:
   26.54  // ----------------------------------------------------------------------------
   26.55  static CMPIStatus Associators(
   26.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   26.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   26.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   26.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   26.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   26.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   26.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   26.63  		const char *assocClass,
   26.64  		const char *resultClass,
   26.65  		const char *role,
   26.66  		const char *resultRole,
   26.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   26.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   26.69  {
   26.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   26.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   26.72 @@ -260,9 +259,9 @@ exit:
   26.73  // ----------------------------------------------------------------------------
   26.74  static CMPIStatus ReferenceNames(
   26.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   26.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   26.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   26.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   26.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   26.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   26.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   26.82  		const char *assocClass, 
   26.83  		const char *role)
   26.84  {
   26.85 @@ -359,12 +358,12 @@ exit:
   26.86  // ----------------------------------------------------------------------------
   26.87  static CMPIStatus References(
   26.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   26.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   26.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   26.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   26.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   26.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   26.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   26.95  		const char *assocClass,
   26.96  		const char *role,
   26.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   26.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   26.99  {
  26.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  26.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  26.102 @@ -460,15 +459,13 @@ exit:
  26.103  // ----------------------------------------------------------------------------
  26.104  static void AssociationInitialize(
  26.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  26.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  26.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  26.108  {
  26.109     _SBLIM_ENTER("AssociationInitialize");
  26.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  26.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  26.112  
  26.113     /* Nothing needs to be done to initialize this provider */
  26.114 -
  26.115 -exit:
  26.116     _SBLIM_RETURN();
  26.117  }
  26.118  
    27.1 --- a/src/Xen_HostedComputerSystem.c	Fri Oct 20 13:20:15 2006 -0600
    27.2 +++ b/src/Xen_HostedComputerSystem.c	Tue Oct 24 11:30:03 2006 -0600
    27.3 @@ -16,7 +16,7 @@
    27.4  // ============================================================================
    27.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    27.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    27.7 -// Contributors:
    27.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    27.9  // Description:
   27.10  // ============================================================================
   27.11  
   27.12 @@ -33,7 +33,7 @@
   27.13  // ----------------------------------------------------------------------------
   27.14  
   27.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   27.16 -static CMPIBroker *_BROKER;
   27.17 +static const CMPIBroker *_BROKER;
   27.18  
   27.19  /* Include utility functions */
   27.20  #include "cmpiutil.h"
   27.21 @@ -65,7 +65,8 @@ static char * _RHSNAMESPACE = "smash";
   27.22  // ----------------------------------------------------------------------------
   27.23  static CMPIStatus AssociationCleanup(
   27.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   27.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   27.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   27.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   27.28  {
   27.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   27.30  
   27.31 @@ -74,8 +75,6 @@ static CMPIStatus AssociationCleanup(
   27.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   27.33  
   27.34     /* Nothing needs to be done for cleanup. */
   27.35 -
   27.36 -exit:
   27.37     _SBLIM_RETURNSTATUS(status);
   27.38  }
   27.39  
   27.40 @@ -85,9 +84,9 @@ exit:
   27.41  // ----------------------------------------------------------------------------
   27.42  static CMPIStatus AssociatorNames(
   27.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   27.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   27.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   27.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   27.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   27.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   27.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   27.50  		const char * assocClass,
   27.51  		const char * resultClass,
   27.52  		const char * role,
   27.53 @@ -178,14 +177,14 @@ exit:
   27.54  // ----------------------------------------------------------------------------
   27.55  static CMPIStatus Associators(
   27.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   27.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   27.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   27.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   27.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   27.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   27.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   27.63  		const char *assocClass,
   27.64  		const char *resultClass,
   27.65  		const char *role,
   27.66  		const char *resultRole,
   27.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   27.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   27.69  {
   27.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   27.71     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
   27.72 @@ -276,9 +275,9 @@ exit:
   27.73  // ----------------------------------------------------------------------------
   27.74  static CMPIStatus ReferenceNames(
   27.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   27.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   27.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   27.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   27.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   27.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   27.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   27.82  		const char *resultClass, 
   27.83  		const char *role)
   27.84  {
   27.85 @@ -303,7 +302,7 @@ static CMPIStatus ReferenceNames(
   27.86        targetclass = _RHSCLASSNAME;
   27.87        targetnamespace = _RHSNAMESPACE;
   27.88        /* Refences of LHS class should always be in LHS namespace. */
   27.89 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   27.90 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   27.91     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   27.92        targetclass = _LHSCLASSNAME;
   27.93        targetnamespace = _LHSNAMESPACE;
   27.94 @@ -388,12 +387,12 @@ exit:
   27.95  // ----------------------------------------------------------------------------
   27.96  static CMPIStatus References(
   27.97  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   27.98 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   27.99 -		CMPIResult * results,		/* [out] Results of this operation. */
  27.100 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  27.101 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  27.102 +		const CMPIResult * results,		/* [out] Results of this operation. */
  27.103 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  27.104  		const char *resultClass,
  27.105  		const char *role,
  27.106 -		char **properties)		/* [in] List of desired properties (NULL=all). */
  27.107 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
  27.108  {
  27.109     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  27.110     char *sourceclass = CMGetCharPtr(CMGetClassName(reference, &status)); /* Class of the source reference object */
  27.111 @@ -416,7 +415,7 @@ static CMPIStatus References(
  27.112        targetclass = _RHSCLASSNAME;
  27.113        targetnamespace = _RHSNAMESPACE;
  27.114        /* Refences of LHS class should always be in LHS namespace. */
  27.115 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  27.116 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  27.117     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  27.118        targetclass = _LHSCLASSNAME;
  27.119        targetnamespace = _LHSNAMESPACE;
  27.120 @@ -503,15 +502,13 @@ exit:
  27.121  // ----------------------------------------------------------------------------
  27.122  static void AssociationInitialize(
  27.123  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  27.124 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  27.125 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  27.126  {
  27.127     _SBLIM_ENTER("AssociationInitialize");
  27.128     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  27.129     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  27.130  
  27.131     /* Nothing needs to be done to initialize this provider */
  27.132 -
  27.133 -exit:
  27.134     _SBLIM_RETURN();
  27.135  }
  27.136  
    28.1 --- a/src/Xen_HostedDisk.c	Fri Oct 20 13:20:15 2006 -0600
    28.2 +++ b/src/Xen_HostedDisk.c	Tue Oct 24 11:30:03 2006 -0600
    28.3 @@ -16,7 +16,7 @@
    28.4  // ============================================================================
    28.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    28.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    28.7 -// Contributors:
    28.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    28.9  // Description:
   28.10  // ============================================================================
   28.11  
   28.12 @@ -33,7 +33,7 @@
   28.13  // ----------------------------------------------------------------------------
   28.14  
   28.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   28.16 -static CMPIBroker *_BROKER;
   28.17 +static const CMPIBroker *_BROKER;
   28.18  
   28.19  /* Include utility functions */
   28.20  #include "cmpiutil.h"
   28.21 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Antece
   28.22  // ----------------------------------------------------------------------------
   28.23  static CMPIStatus AssociationCleanup(
   28.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   28.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   28.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   28.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   28.28  {
   28.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   28.30  
   28.31 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   28.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   28.33  
   28.34     /* Nothing needs to be done for cleanup. */
   28.35 -
   28.36 -exit:
   28.37     _SBLIM_RETURNSTATUS(status);
   28.38  }
   28.39  
   28.40 @@ -83,9 +82,9 @@ exit:
   28.41  // ----------------------------------------------------------------------------
   28.42  static CMPIStatus AssociatorNames(
   28.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   28.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   28.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   28.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   28.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   28.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   28.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   28.50  		const char * assocClass,
   28.51  		const char * resultClass,
   28.52  		const char * role,
   28.53 @@ -170,14 +169,14 @@ exit:
   28.54  // ----------------------------------------------------------------------------
   28.55  static CMPIStatus Associators(
   28.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   28.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   28.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   28.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   28.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   28.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   28.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   28.63  		const char *assocClass,
   28.64  		const char *resultClass,
   28.65  		const char *role,
   28.66  		const char *resultRole,
   28.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   28.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   28.69  {
   28.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   28.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   28.72 @@ -261,9 +260,9 @@ exit:
   28.73  // ----------------------------------------------------------------------------
   28.74  static CMPIStatus ReferenceNames(
   28.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   28.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   28.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   28.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   28.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   28.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   28.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   28.82  		const char *assocClass, 
   28.83  		const char *role)
   28.84  {
   28.85 @@ -360,12 +359,12 @@ exit:
   28.86  // ----------------------------------------------------------------------------
   28.87  static CMPIStatus References(
   28.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   28.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   28.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   28.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   28.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   28.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   28.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   28.95  		const char *assocClass,
   28.96  		const char *role,
   28.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   28.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   28.99  {
  28.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  28.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  28.102 @@ -461,15 +460,13 @@ exit:
  28.103  // ----------------------------------------------------------------------------
  28.104  static void AssociationInitialize(
  28.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  28.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  28.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  28.108  {
  28.109     _SBLIM_ENTER("AssociationInitialize");
  28.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  28.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  28.112  
  28.113     /* Nothing needs to be done to initialize this provider */
  28.114 -
  28.115 -exit:
  28.116     _SBLIM_RETURN();
  28.117  }
  28.118  
    29.1 --- a/src/Xen_HostedMemory.c	Fri Oct 20 13:20:15 2006 -0600
    29.2 +++ b/src/Xen_HostedMemory.c	Tue Oct 24 11:30:03 2006 -0600
    29.3 @@ -16,7 +16,7 @@
    29.4  // ============================================================================
    29.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    29.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    29.7 -// Contributors:
    29.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    29.9  // Description:
   29.10  // ============================================================================
   29.11  
   29.12 @@ -33,7 +33,7 @@
   29.13  // ----------------------------------------------------------------------------
   29.14  
   29.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   29.16 -static CMPIBroker *_BROKER;
   29.17 +static const CMPIBroker *_BROKER;
   29.18  
   29.19  /* Include utility functions */
   29.20  #include "cmpiutil.h"
   29.21 @@ -64,7 +64,8 @@ static char * _RHSPROPERTYNAME = "Antece
   29.22  // ----------------------------------------------------------------------------
   29.23  static CMPIStatus AssociationCleanup(
   29.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   29.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   29.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   29.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   29.28  {
   29.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   29.30  
   29.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   29.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   29.33  
   29.34     /* Nothing needs to be done for cleanup. */
   29.35 -
   29.36 -exit:
   29.37     _SBLIM_RETURNSTATUS(status);
   29.38  }
   29.39  
   29.40 @@ -84,9 +83,9 @@ exit:
   29.41  // ----------------------------------------------------------------------------
   29.42  static CMPIStatus AssociatorNames(
   29.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   29.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   29.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   29.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   29.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   29.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   29.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   29.50  		const char * assocClass,
   29.51  		const char * resultClass,
   29.52  		const char * role,
   29.53 @@ -171,14 +170,14 @@ exit:
   29.54  // ----------------------------------------------------------------------------
   29.55  static CMPIStatus Associators(
   29.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   29.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   29.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   29.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   29.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   29.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   29.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   29.63  		const char *assocClass,
   29.64  		const char *resultClass,
   29.65  		const char *role,
   29.66  		const char *resultRole,
   29.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   29.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   29.69  {
   29.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   29.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   29.72 @@ -262,9 +261,9 @@ exit:
   29.73  // ----------------------------------------------------------------------------
   29.74  static CMPIStatus ReferenceNames(
   29.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   29.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   29.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   29.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   29.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   29.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   29.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   29.82  		const char *assocClass, 
   29.83  		const char *role)
   29.84  {
   29.85 @@ -361,12 +360,12 @@ exit:
   29.86  // ----------------------------------------------------------------------------
   29.87  static CMPIStatus References(
   29.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   29.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   29.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   29.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   29.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   29.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   29.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   29.95  		const char *assocClass,
   29.96  		const char *role,
   29.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   29.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   29.99  {
  29.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  29.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  29.102 @@ -462,15 +461,13 @@ exit:
  29.103  // ----------------------------------------------------------------------------
  29.104  static void AssociationInitialize(
  29.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  29.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  29.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  29.108  {
  29.109     _SBLIM_ENTER("AssociationInitialize");
  29.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  29.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  29.112  
  29.113     /* Nothing needs to be done to initialize this provider */
  29.114 -
  29.115 -exit:
  29.116     _SBLIM_RETURN();
  29.117  }
  29.118  
    30.1 --- a/src/Xen_HostedMemoryPool.c	Fri Oct 20 13:20:15 2006 -0600
    30.2 +++ b/src/Xen_HostedMemoryPool.c	Tue Oct 24 11:30:03 2006 -0600
    30.3 @@ -33,7 +33,7 @@
    30.4  // ----------------------------------------------------------------------------
    30.5  
    30.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    30.7 -static CMPIBroker *_BROKER;
    30.8 +static const CMPIBroker *_BROKER;
    30.9  
   30.10  /* Include utility functions */
   30.11  #include "cmpiutil.h"
   30.12 @@ -69,7 +69,8 @@ static char * _XEN_DOMU_CLASS = "Xen_Com
   30.13  // ----------------------------------------------------------------------------
   30.14  static CMPIStatus AssociationCleanup(
   30.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   30.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   30.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   30.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   30.19  {
   30.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   30.21  
   30.22 @@ -89,9 +90,9 @@ exit:
   30.23  // ----------------------------------------------------------------------------
   30.24  static CMPIStatus AssociatorNames(
   30.25  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   30.26 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   30.27 -		CMPIResult * results,		/* [out] Results of this operation. */
   30.28 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   30.29 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   30.30 +		const CMPIResult * results,		/* [out] Results of this operation. */
   30.31 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   30.32  		const char * assocClass,
   30.33  		const char * resultClass,
   30.34  		const char * role,
   30.35 @@ -192,14 +193,14 @@ exit:
   30.36  // ----------------------------------------------------------------------------
   30.37  static CMPIStatus Associators(
   30.38  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   30.39 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   30.40 -		CMPIResult * results,		/* [out] Results of this operation. */
   30.41 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   30.42 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   30.43 +		const CMPIResult * results,		/* [out] Results of this operation. */
   30.44 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   30.45  		const char *assocClass,
   30.46  		const char *resultClass,
   30.47  		const char *role,
   30.48  		const char *resultRole,
   30.49 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   30.50 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   30.51  {
   30.52     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   30.53     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   30.54 @@ -299,9 +300,9 @@ exit:
   30.55  // ----------------------------------------------------------------------------
   30.56  static CMPIStatus ReferenceNames(
   30.57  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   30.58 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   30.59 -		CMPIResult * results,		/* [out] Results of this operation. */
   30.60 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   30.61 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   30.62 +		const CMPIResult * results,		/* [out] Results of this operation. */
   30.63 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   30.64  		const char *assocClass, 
   30.65  		const char *role)
   30.66  {
   30.67 @@ -346,7 +347,7 @@ static CMPIStatus ReferenceNames(
   30.68        targetclass = _RHSCLASSNAME;
   30.69        targetnamespace = _RHSNAMESPACE;
   30.70        /* Refences of LHS class should always be in LHS namespace. */
   30.71 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   30.72 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   30.73     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   30.74        targetclass = _LHSCLASSNAME;
   30.75        targetnamespace = _LHSNAMESPACE;
   30.76 @@ -413,12 +414,12 @@ static CMPIStatus ReferenceNames(
   30.77  // ----------------------------------------------------------------------------
   30.78  static CMPIStatus References(
   30.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   30.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   30.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   30.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   30.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   30.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   30.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   30.86  		const char *assocClass,
   30.87  		const char *role,
   30.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   30.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   30.90  {
   30.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   30.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   30.93 @@ -461,7 +462,7 @@ static CMPIStatus References(
   30.94        targetclass = _RHSCLASSNAME;
   30.95        targetnamespace = _RHSNAMESPACE;
   30.96        /* Refences of LHS class should always be in LHS namespace. */
   30.97 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   30.98 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   30.99     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  30.100        targetclass = _LHSCLASSNAME;
  30.101        targetnamespace = _LHSNAMESPACE;
  30.102 @@ -529,15 +530,13 @@ exit:
  30.103  // ----------------------------------------------------------------------------
  30.104  static void AssociationInitialize(
  30.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  30.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  30.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  30.108  {
  30.109     _SBLIM_ENTER("AssociationInitialize");
  30.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  30.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  30.112  
  30.113     /* Nothing needs to be done to initialize this provider */
  30.114 -
  30.115 -exit:
  30.116     _SBLIM_RETURN();
  30.117  }
  30.118  
    31.1 --- a/src/Xen_HostedNetworkPort.c	Fri Oct 20 13:20:15 2006 -0600
    31.2 +++ b/src/Xen_HostedNetworkPort.c	Tue Oct 24 11:30:03 2006 -0600
    31.3 @@ -16,7 +16,7 @@
    31.4  // ============================================================================
    31.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    31.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    31.7 -// Contributors:
    31.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    31.9  // Description:
   31.10  // ============================================================================
   31.11  
   31.12 @@ -33,7 +33,7 @@
   31.13  // ----------------------------------------------------------------------------
   31.14  
   31.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   31.16 -static CMPIBroker *_BROKER;
   31.17 +static const CMPIBroker *_BROKER;
   31.18  
   31.19  /* Include utility functions */
   31.20  #include "cmpiutil.h"
   31.21 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Antece
   31.22  // ----------------------------------------------------------------------------
   31.23  static CMPIStatus AssociationCleanup(
   31.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   31.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   31.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   31.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   31.28  {
   31.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   31.30  
   31.31 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   31.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   31.33  
   31.34     /* Nothing needs to be done for cleanup. */
   31.35 -
   31.36 -exit:
   31.37     _SBLIM_RETURNSTATUS(status);
   31.38  }
   31.39  
   31.40 @@ -83,9 +82,9 @@ exit:
   31.41  // ----------------------------------------------------------------------------
   31.42  static CMPIStatus AssociatorNames(
   31.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   31.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   31.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   31.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   31.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   31.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   31.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   31.50  		const char * assocClass,
   31.51  		const char * resultClass,
   31.52  		const char * role,
   31.53 @@ -170,14 +169,14 @@ exit:
   31.54  // ----------------------------------------------------------------------------
   31.55  static CMPIStatus Associators(
   31.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   31.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   31.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   31.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   31.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   31.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   31.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   31.63  		const char *assocClass,
   31.64  		const char *resultClass,
   31.65  		const char *role,
   31.66  		const char *resultRole,
   31.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   31.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   31.69  {
   31.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   31.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   31.72 @@ -261,9 +260,9 @@ exit:
   31.73  // ----------------------------------------------------------------------------
   31.74  static CMPIStatus ReferenceNames(
   31.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   31.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   31.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   31.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   31.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   31.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   31.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   31.82  		const char *assocClass, 
   31.83  		const char *role)
   31.84  {
   31.85 @@ -360,12 +359,12 @@ exit:
   31.86  // ----------------------------------------------------------------------------
   31.87  static CMPIStatus References(
   31.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   31.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   31.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   31.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   31.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   31.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   31.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   31.95  		const char *assocClass,
   31.96  		const char *role,
   31.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   31.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   31.99  {
  31.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  31.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  31.102 @@ -461,15 +460,13 @@ exit:
  31.103  // ----------------------------------------------------------------------------
  31.104  static void AssociationInitialize(
  31.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  31.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  31.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  31.108  {
  31.109     _SBLIM_ENTER("AssociationInitialize");
  31.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  31.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  31.112  
  31.113     /* Nothing needs to be done to initialize this provider */
  31.114 -
  31.115 -exit:
  31.116     _SBLIM_RETURN();
  31.117  }
  31.118  
    32.1 --- a/src/Xen_HostedProcessor.c	Fri Oct 20 13:20:15 2006 -0600
    32.2 +++ b/src/Xen_HostedProcessor.c	Tue Oct 24 11:30:03 2006 -0600
    32.3 @@ -16,7 +16,7 @@
    32.4  // ============================================================================
    32.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    32.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    32.7 -// Contributors:
    32.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    32.9  // Description:
   32.10  // ============================================================================
   32.11  
   32.12 @@ -33,7 +33,7 @@
   32.13  // ----------------------------------------------------------------------------
   32.14  
   32.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   32.16 -static CMPIBroker *_BROKER;
   32.17 +static const CMPIBroker *_BROKER;
   32.18  
   32.19  /* Include utility functions */
   32.20  #include "cmpiutil.h"
   32.21 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Antece
   32.22  // ----------------------------------------------------------------------------
   32.23  static CMPIStatus AssociationCleanup(
   32.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   32.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   32.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   32.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   32.28  {
   32.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   32.30  
   32.31 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   32.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   32.33  
   32.34     /* Nothing needs to be done for cleanup. */
   32.35 -
   32.36 -exit:
   32.37     _SBLIM_RETURNSTATUS(status);
   32.38  }
   32.39  
   32.40 @@ -83,9 +82,9 @@ exit:
   32.41  // ----------------------------------------------------------------------------
   32.42  static CMPIStatus AssociatorNames(
   32.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   32.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   32.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   32.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   32.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   32.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   32.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   32.50  		const char * assocClass,
   32.51  		const char * resultClass,
   32.52  		const char * role,
   32.53 @@ -170,14 +169,14 @@ exit:
   32.54  // ----------------------------------------------------------------------------
   32.55  static CMPIStatus Associators(
   32.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   32.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   32.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   32.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   32.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   32.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   32.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   32.63  		const char *assocClass,
   32.64  		const char *resultClass,
   32.65  		const char *role,
   32.66  		const char *resultRole,
   32.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   32.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   32.69  {
   32.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   32.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   32.72 @@ -261,9 +260,9 @@ exit:
   32.73  // ----------------------------------------------------------------------------
   32.74  static CMPIStatus ReferenceNames(
   32.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   32.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   32.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   32.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   32.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   32.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   32.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   32.82  		const char *assocClass, 
   32.83  		const char *role)
   32.84  {
   32.85 @@ -360,12 +359,12 @@ exit:
   32.86  // ----------------------------------------------------------------------------
   32.87  static CMPIStatus References(
   32.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   32.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   32.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   32.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   32.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   32.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   32.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   32.95  		const char *assocClass,
   32.96  		const char *role,
   32.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   32.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   32.99  {
  32.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  32.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  32.102 @@ -461,15 +460,13 @@ exit:
  32.103  // ----------------------------------------------------------------------------
  32.104  static void AssociationInitialize(
  32.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  32.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  32.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  32.108  {
  32.109     _SBLIM_ENTER("AssociationInitialize");
  32.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  32.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  32.112  
  32.113     /* Nothing needs to be done to initialize this provider */
  32.114 -
  32.115 -exit:
  32.116     _SBLIM_RETURN();
  32.117  }
  32.118  
    33.1 --- a/src/Xen_HostedProcessorPool.c	Fri Oct 20 13:20:15 2006 -0600
    33.2 +++ b/src/Xen_HostedProcessorPool.c	Tue Oct 24 11:30:03 2006 -0600
    33.3 @@ -15,7 +15,7 @@
    33.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    33.5  // ============================================================================
    33.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    33.7 -// Contributors:
    33.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    33.9  // Description:
   33.10  // ============================================================================
   33.11  
   33.12 @@ -32,7 +32,7 @@
   33.13  // ----------------------------------------------------------------------------
   33.14  
   33.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   33.16 -static CMPIBroker *_BROKER;
   33.17 +static const CMPIBroker *_BROKER;
   33.18  
   33.19  /* Include utility functions */
   33.20  #include "cmpiutil.h"
   33.21 @@ -68,7 +68,8 @@ static char * _XEN_DOMU_CLASS = "Xen_Com
   33.22  // ----------------------------------------------------------------------------
   33.23  static CMPIStatus AssociationCleanup(
   33.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   33.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   33.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   33.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   33.28  {
   33.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   33.30  
   33.31 @@ -77,8 +78,6 @@ static CMPIStatus AssociationCleanup(
   33.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   33.33  
   33.34     /* Nothing needs to be done for cleanup. */
   33.35 -
   33.36 -exit:
   33.37     _SBLIM_RETURNSTATUS(status);
   33.38  }
   33.39  
   33.40 @@ -88,9 +87,9 @@ exit:
   33.41  // ----------------------------------------------------------------------------
   33.42  static CMPIStatus AssociatorNames(
   33.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   33.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   33.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   33.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   33.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   33.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   33.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   33.50  		const char * assocClass,
   33.51  		const char * resultClass,
   33.52  		const char * role,
   33.53 @@ -191,14 +190,14 @@ exit:
   33.54  // ----------------------------------------------------------------------------
   33.55  static CMPIStatus Associators(
   33.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   33.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   33.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   33.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   33.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   33.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   33.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   33.63  		const char *assocClass,
   33.64  		const char *resultClass,
   33.65  		const char *role,
   33.66  		const char *resultRole,
   33.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   33.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   33.69  {
   33.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   33.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   33.72 @@ -297,9 +296,9 @@ exit:
   33.73  // ----------------------------------------------------------------------------
   33.74  static CMPIStatus ReferenceNames(
   33.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   33.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   33.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   33.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   33.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   33.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   33.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   33.82  		const char *assocClass, 
   33.83  		const char *role)
   33.84  {
   33.85 @@ -344,7 +343,7 @@ static CMPIStatus ReferenceNames(
   33.86        targetclass = _RHSCLASSNAME;
   33.87        targetnamespace = _RHSNAMESPACE;
   33.88        /* Refences of LHS class should always be in LHS namespace. */
   33.89 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   33.90 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   33.91     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   33.92        targetclass = _LHSCLASSNAME;
   33.93        targetnamespace = _LHSNAMESPACE;
   33.94 @@ -410,12 +409,12 @@ exit:
   33.95  // ----------------------------------------------------------------------------
   33.96  static CMPIStatus References(
   33.97  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   33.98 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   33.99 -		CMPIResult * results,		/* [out] Results of this operation. */
  33.100 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  33.101 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  33.102 +		const CMPIResult * results,		/* [out] Results of this operation. */
  33.103 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  33.104  		const char *assocClass,
  33.105  		const char *role,
  33.106 -		char **properties)		/* [in] List of desired properties (NULL=all). */
  33.107 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
  33.108  {
  33.109     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  33.110     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  33.111 @@ -458,7 +457,7 @@ static CMPIStatus References(
  33.112        targetclass = _RHSCLASSNAME;
  33.113        targetnamespace = _RHSNAMESPACE;
  33.114        /* Refences of LHS class should always be in LHS namespace. */
  33.115 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  33.116 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  33.117     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  33.118        targetclass = _LHSCLASSNAME;
  33.119        targetnamespace = _LHSNAMESPACE;
  33.120 @@ -525,15 +524,13 @@ exit:
  33.121  // ----------------------------------------------------------------------------
  33.122  static void AssociationInitialize(
  33.123  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  33.124 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  33.125 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  33.126  {
  33.127     _SBLIM_ENTER("AssociationInitialize");
  33.128     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  33.129     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  33.130  
  33.131     /* Nothing needs to be done to initialize this provider */
  33.132 -
  33.133 -exit:
  33.134     _SBLIM_RETURN();
  33.135  }
  33.136  
    34.1 --- a/src/Xen_HostedVirtualSystemManagementService.c	Fri Oct 20 13:20:15 2006 -0600
    34.2 +++ b/src/Xen_HostedVirtualSystemManagementService.c	Tue Oct 24 11:30:03 2006 -0600
    34.3 @@ -15,7 +15,7 @@
    34.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    34.5  // ============================================================================
    34.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    34.7 -// Contributors:
    34.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    34.9  // Description:
   34.10  // ============================================================================
   34.11  
   34.12 @@ -32,7 +32,7 @@
   34.13  // ----------------------------------------------------------------------------
   34.14  
   34.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   34.16 -static CMPIBroker *_BROKER;
   34.17 +static const CMPIBroker *_BROKER;
   34.18  
   34.19  /* Include utility functions */
   34.20  #include "cmpiutil.h"
   34.21 @@ -67,7 +67,8 @@ static char * _XEN_DOMU_CLASS = "Xen_Com
   34.22  // ----------------------------------------------------------------------------
   34.23  static CMPIStatus AssociationCleanup(
   34.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   34.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   34.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   34.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   34.28  {
   34.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   34.30  
   34.31 @@ -76,8 +77,6 @@ static CMPIStatus AssociationCleanup(
   34.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   34.33  
   34.34     /* Nothing needs to be done for cleanup. */
   34.35 -
   34.36 -exit:
   34.37     _SBLIM_RETURNSTATUS(status);
   34.38  }
   34.39  
   34.40 @@ -87,9 +86,9 @@ exit:
   34.41  // ----------------------------------------------------------------------------
   34.42  static CMPIStatus AssociatorNames(
   34.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   34.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   34.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   34.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   34.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   34.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   34.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   34.50  		const char * assocClass,
   34.51  		const char * resultClass,
   34.52  		const char * role,
   34.53 @@ -188,14 +187,14 @@ exit:
   34.54  // ----------------------------------------------------------------------------
   34.55  static CMPIStatus Associators(
   34.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   34.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   34.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   34.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   34.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   34.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   34.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   34.63  		const char *assocClass,
   34.64  		const char *resultClass,
   34.65  		const char *role,
   34.66  		const char *resultRole,
   34.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   34.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   34.69  {
   34.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   34.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   34.72 @@ -294,9 +293,9 @@ exit:
   34.73  // ----------------------------------------------------------------------------
   34.74  static CMPIStatus ReferenceNames(
   34.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   34.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   34.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   34.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   34.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   34.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   34.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   34.82  		const char *assocClass, 
   34.83  		const char *role)
   34.84  {
   34.85 @@ -341,7 +340,7 @@ static CMPIStatus ReferenceNames(
   34.86        targetclass = _RHSCLASSNAME;
   34.87        targetnamespace = _RHSNAMESPACE;
   34.88        /* Refences of LHS class should always be in LHS namespace. */
   34.89 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   34.90 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   34.91     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   34.92        targetclass = _LHSCLASSNAME;
   34.93        targetnamespace = _LHSNAMESPACE;
   34.94 @@ -407,12 +406,12 @@ exit:
   34.95  // ----------------------------------------------------------------------------
   34.96  static CMPIStatus References(
   34.97  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   34.98 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   34.99 -		CMPIResult * results,		/* [out] Results of this operation. */
  34.100 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  34.101 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  34.102 +		const CMPIResult * results,		/* [out] Results of this operation. */
  34.103 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
  34.104  		const char *assocClass,
  34.105  		const char *role,
  34.106 -		char **properties)		/* [in] List of desired properties (NULL=all). */
  34.107 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
  34.108  {
  34.109     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  34.110     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  34.111 @@ -455,7 +454,7 @@ static CMPIStatus References(
  34.112        targetclass = _RHSCLASSNAME;
  34.113        targetnamespace = _RHSNAMESPACE;
  34.114        /* Refences of LHS class should always be in LHS namespace. */
  34.115 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  34.116 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  34.117     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  34.118        targetclass = _LHSCLASSNAME;
  34.119        targetnamespace = _LHSNAMESPACE;
  34.120 @@ -522,15 +521,13 @@ exit:
  34.121  // ----------------------------------------------------------------------------
  34.122  static void AssociationInitialize(
  34.123  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  34.124 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  34.125 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  34.126  {
  34.127     _SBLIM_ENTER("AssociationInitialize");
  34.128     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  34.129     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  34.130  
  34.131     /* Nothing needs to be done to initialize this provider */
  34.132 -
  34.133 -exit:
  34.134     _SBLIM_RETURN();
  34.135  }
  34.136  
    35.1 --- a/src/Xen_Memory.c	Fri Oct 20 13:20:15 2006 -0600
    35.2 +++ b/src/Xen_Memory.c	Tue Oct 24 11:30:03 2006 -0600
    35.3 @@ -16,7 +16,7 @@
    35.4  // ============================================================================
    35.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    35.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    35.7 -// Contributors:
    35.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    35.9  // Description:
   35.10  // ============================================================================
   35.11  
   35.12 @@ -31,7 +31,7 @@
   35.13  // ----------------------------------------------------------------------------
   35.14  
   35.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   35.16 -static CMPIBroker *_BROKER;
   35.17 +static const CMPIBroker *_BROKER;
   35.18  
   35.19  /* Include utility functions */
   35.20  #include "cmpiutil.h"
   35.21 @@ -65,7 +65,8 @@ const static char * _KEYNAMES[] = {"Syst
   35.22  // ----------------------------------------------------------------------------
   35.23  static CMPIStatus Cleanup(
   35.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   35.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   35.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   35.28  {
   35.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   35.30  
   35.31 @@ -74,8 +75,6 @@ static CMPIStatus Cleanup(
   35.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   35.33  
   35.34     /* Nothing needs to be done for cleanup. */
   35.35 -
   35.36 -exit:
   35.37     _SBLIM_RETURNSTATUS(status);
   35.38  }
   35.39  
   35.40 @@ -85,9 +84,9 @@ exit:
   35.41  // ----------------------------------------------------------------------------
   35.42  static CMPIStatus EnumInstanceNames(
   35.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   35.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   35.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   35.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   35.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   35.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   35.50  {
   35.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   35.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   35.53 @@ -165,9 +164,9 @@ exit:
   35.54  // ----------------------------------------------------------------------------
   35.55  static CMPIStatus EnumInstances(
   35.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   35.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   35.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   35.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   35.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   35.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   35.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   35.64  {
   35.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   35.66 @@ -246,9 +245,9 @@ exit:
   35.67  // ----------------------------------------------------------------------------
   35.68  static CMPIStatus GetInstance(
   35.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   35.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   35.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   35.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   35.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   35.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   35.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   35.77  {
   35.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   35.79 @@ -331,10 +330,11 @@ exit:
   35.80  // ----------------------------------------------------------------------------
   35.81  static CMPIStatus SetInstance(
   35.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   35.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   35.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   35.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   35.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   35.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   35.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   35.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   35.91 +        const char **properties)
   35.92  {
   35.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   35.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   35.95 @@ -403,10 +403,10 @@ exit:
   35.96  // ----------------------------------------------------------------------------
   35.97  static CMPIStatus CreateInstance(
   35.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   35.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  35.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  35.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  35.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  35.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  35.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  35.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  35.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  35.107  {
  35.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  35.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  35.110 @@ -482,9 +482,9 @@ exit:
  35.111  // ----------------------------------------------------------------------------
  35.112  static CMPIStatus DeleteInstance(
  35.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  35.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  35.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  35.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  35.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  35.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  35.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  35.120  {
  35.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  35.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  35.123 @@ -553,11 +553,11 @@ exit:
  35.124  // ----------------------------------------------------------------------------
  35.125  static CMPIStatus ExecQuery(
  35.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  35.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  35.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  35.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  35.130 -		char * language,		/* [in] Name of the query language. */
  35.131 -		char * query)			/* [in] Text of the query written in the query language. */
  35.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  35.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  35.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  35.135 +		const char * language,		/* [in] Name of the query language. */
  35.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  35.137  {
  35.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  35.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  35.140 @@ -586,15 +586,13 @@ exit:
  35.141  // ----------------------------------------------------------------------------
  35.142  static void Initialize(
  35.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  35.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  35.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  35.146  {
  35.147     _SBLIM_ENTER("Initialize");
  35.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  35.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  35.150  
  35.151     /* Nothing needs to be done to initialize this provider */
  35.152 -
  35.153 -exit:
  35.154     _SBLIM_RETURN();
  35.155  }
  35.156  
    36.1 --- a/src/Xen_MemoryAllocatedFromPool.c	Fri Oct 20 13:20:15 2006 -0600
    36.2 +++ b/src/Xen_MemoryAllocatedFromPool.c	Tue Oct 24 11:30:03 2006 -0600
    36.3 @@ -32,7 +32,7 @@
    36.4  // ----------------------------------------------------------------------------
    36.5  
    36.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    36.7 -static CMPIBroker *_BROKER;
    36.8 +static const CMPIBroker *_BROKER;
    36.9  
   36.10  /* Include utility functions */
   36.11  #include "cmpiutil.h"
   36.12 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Depend
   36.13  // ----------------------------------------------------------------------------
   36.14  static CMPIStatus AssociationCleanup(
   36.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   36.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   36.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   36.19  {
   36.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   36.21  
   36.22 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   36.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   36.24  
   36.25     /* Nothing needs to be done for cleanup. */
   36.26 -
   36.27 -exit:
   36.28     _SBLIM_RETURNSTATUS(status);
   36.29  }
   36.30  
   36.31 @@ -83,9 +82,9 @@ exit:
   36.32  // ----------------------------------------------------------------------------
   36.33  static CMPIStatus AssociatorNames(
   36.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   36.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   36.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   36.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   36.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   36.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   36.41  		const char * assocClass,
   36.42  		const char * resultClass,
   36.43  		const char * role,
   36.44 @@ -172,14 +171,14 @@ exit:
   36.45  // ----------------------------------------------------------------------------
   36.46  static CMPIStatus Associators(
   36.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   36.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   36.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   36.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   36.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   36.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   36.54  		const char *assocClass,
   36.55  		const char *resultClass,
   36.56  		const char *role,
   36.57  		const char *resultRole,
   36.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   36.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   36.60  {
   36.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   36.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   36.63 @@ -265,9 +264,9 @@ exit:
   36.64  // ----------------------------------------------------------------------------
   36.65  static CMPIStatus ReferenceNames(
   36.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   36.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   36.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   36.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   36.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   36.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   36.73  		const char *assocClass, 
   36.74  		const char *role)
   36.75  {
   36.76 @@ -363,12 +362,12 @@ exit:
   36.77  // ----------------------------------------------------------------------------
   36.78  static CMPIStatus References(
   36.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   36.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   36.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   36.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   36.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   36.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   36.86  		const char *assocClass,
   36.87  		const char *role,
   36.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   36.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   36.90  {
   36.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   36.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   36.93 @@ -464,15 +463,13 @@ exit:
   36.94  // ----------------------------------------------------------------------------
   36.95  static void AssociationInitialize(
   36.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   36.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   36.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   36.99  {
  36.100     _SBLIM_ENTER("AssociationInitialize");
  36.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  36.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  36.103  
  36.104     /* Nothing needs to be done to initialize this provider */
  36.105 -
  36.106 -exit:
  36.107     _SBLIM_RETURN();
  36.108  }
  36.109  
    37.1 --- a/src/Xen_MemoryCapabilitiesSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    37.2 +++ b/src/Xen_MemoryCapabilitiesSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    37.3 @@ -15,7 +15,7 @@
    37.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    37.5  // ============================================================================
    37.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    37.7 -// Contributors:
    37.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    37.9  // Description:
   37.10  // ============================================================================
   37.11  
   37.12 @@ -30,7 +30,7 @@
   37.13  // ----------------------------------------------------------------------------
   37.14  
   37.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   37.16 -static CMPIBroker *_BROKER;
   37.17 +static const CMPIBroker *_BROKER;
   37.18  
   37.19  /* Include utility functions */
   37.20  #include "cmpiutil.h"
   37.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   37.22  // ----------------------------------------------------------------------------
   37.23  static CMPIStatus Cleanup(
   37.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   37.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   37.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   37.28  {
   37.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   37.30  
   37.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   37.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   37.33  
   37.34     /* Nothing needs to be done for cleanup. */
   37.35 -
   37.36 -exit:
   37.37     _SBLIM_RETURNSTATUS(status);
   37.38  }
   37.39  
   37.40 @@ -84,9 +83,9 @@ exit:
   37.41  // ----------------------------------------------------------------------------
   37.42  static CMPIStatus EnumInstanceNames(
   37.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   37.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   37.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   37.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   37.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   37.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   37.50  {
   37.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   37.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   37.53 @@ -164,9 +163,9 @@ exit:
   37.54  // ----------------------------------------------------------------------------
   37.55  static CMPIStatus EnumInstances(
   37.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   37.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   37.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   37.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   37.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   37.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   37.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   37.64  {
   37.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   37.66 @@ -245,9 +244,9 @@ exit:
   37.67  // ----------------------------------------------------------------------------
   37.68  static CMPIStatus GetInstance(
   37.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   37.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   37.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   37.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   37.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   37.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   37.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   37.77  {
   37.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   37.79 @@ -330,10 +329,11 @@ exit:
   37.80  // ----------------------------------------------------------------------------
   37.81  static CMPIStatus SetInstance(
   37.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   37.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   37.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   37.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   37.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   37.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   37.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   37.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   37.91 +        const char **properties)
   37.92  {
   37.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   37.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   37.95 @@ -402,10 +402,10 @@ exit:
   37.96  // ----------------------------------------------------------------------------
   37.97  static CMPIStatus CreateInstance(
   37.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   37.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  37.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  37.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  37.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  37.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  37.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  37.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  37.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  37.107  {
  37.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  37.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  37.110 @@ -481,9 +481,9 @@ exit:
  37.111  // ----------------------------------------------------------------------------
  37.112  static CMPIStatus DeleteInstance(
  37.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  37.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  37.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  37.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  37.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  37.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  37.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  37.120  {
  37.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  37.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  37.123 @@ -552,11 +552,11 @@ exit:
  37.124  // ----------------------------------------------------------------------------
  37.125  static CMPIStatus ExecQuery(
  37.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  37.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  37.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  37.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  37.130 -		char * language,		/* [in] Name of the query language. */
  37.131 -		char * query)			/* [in] Text of the query written in the query language. */
  37.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  37.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  37.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  37.135 +		const char * language,		/* [in] Name of the query language. */
  37.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  37.137  {
  37.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  37.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  37.140 @@ -585,15 +585,13 @@ exit:
  37.141  // ----------------------------------------------------------------------------
  37.142  static void Initialize(
  37.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  37.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  37.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  37.146  {
  37.147     _SBLIM_ENTER("Initialize");
  37.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  37.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  37.150  
  37.151     /* Nothing needs to be done to initialize this provider */
  37.152 -
  37.153 -exit:
  37.154     _SBLIM_RETURN();
  37.155  }
  37.156  
    38.1 --- a/src/Xen_MemoryCapabilitiesSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    38.2 +++ b/src/Xen_MemoryCapabilitiesSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    38.3 @@ -15,11 +15,12 @@
    38.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    38.5  // ============================================================================
    38.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    38.7 -// Contributors:
    38.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    38.9  // Description:
   38.10  // ============================================================================
   38.11  
   38.12  #include <string.h>
   38.13 +#include <stdlib.h>
   38.14  
   38.15  #include "Xen_MemoryCapabilitiesSettingData_Resource.h"
   38.16  
   38.17 @@ -113,7 +114,7 @@ int Xen_MemoryCapabilitiesSettingData_ge
   38.18  // ----------------------------------------------------------------------------
   38.19  
   38.20  /* Get the specific resource that matches the CMPI object path. */
   38.21 -int Xen_MemoryCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   38.22 +int Xen_MemoryCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   38.23  {
   38.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   38.25  
   38.26 @@ -183,7 +184,7 @@ int Xen_MemoryCapabilitiesSettingData_fr
   38.27  // ---------------------------------------------------------------------------- 
   38.28  
   38.29  /* Set the property values of a CMPI instance from a specific resource. */
   38.30 -int Xen_MemoryCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   38.31 +int Xen_MemoryCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   38.32  {
   38.33     if (resource == NULL) return 0;
   38.34     if (CMIsNullObject(instance)) return 0;
   38.35 @@ -220,7 +221,7 @@ int Xen_MemoryCapabilitiesSettingData_de
   38.36  // ----------------------------------------------------------------------------
   38.37  
   38.38  /* Modify the specified resource using the property values of a CMPI instance. */
   38.39 -int Xen_MemoryCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   38.40 +int Xen_MemoryCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   38.41  {
   38.42     /* Unsupported. */
   38.43     return -1;
   38.44 @@ -229,7 +230,7 @@ int Xen_MemoryCapabilitiesSettingData_se
   38.45  // ----------------------------------------------------------------------------
   38.46  
   38.47  /* Create a new resource using the property values of a CMPI instance. */
   38.48 -int Xen_MemoryCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   38.49 +int Xen_MemoryCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   38.50  {
   38.51     /* Unsupported. */
   38.52     return -1;
    39.1 --- a/src/Xen_MemoryCapabilitiesSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    39.2 +++ b/src/Xen_MemoryCapabilitiesSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    39.3 @@ -15,7 +15,7 @@
    39.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    39.5  // ============================================================================
    39.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    39.7 -// Contributors:
    39.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    39.9  // Description:
   39.10  // ============================================================================
   39.11  
   39.12 @@ -66,13 +66,13 @@ int Xen_MemoryCapabilitiesSettingData_fr
   39.13  int Xen_MemoryCapabilitiesSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   39.14  
   39.15  /* Get the specific resource that matches the CMPI object path. */
   39.16 -int Xen_MemoryCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   39.17 +int Xen_MemoryCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   39.18  
   39.19  /* Free/deallocate/cleanup a resource after use. */
   39.20  int Xen_MemoryCapabilitiesSettingData_freeResource( _RESOURCE * resource );
   39.21  
   39.22  /* Set the property values of a CMPI instance from a specific resource. */
   39.23 -int Xen_MemoryCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   39.24 +int Xen_MemoryCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   39.25  
   39.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   39.27  
   39.28 @@ -80,8 +80,8 @@ int Xen_MemoryCapabilitiesSettingData_se
   39.29  int Xen_MemoryCapabilitiesSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   39.30  
   39.31  /* Modify the specified resource using the property values of a CMPI instance. */
   39.32 -int Xen_MemoryCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   39.33 +int Xen_MemoryCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   39.34  
   39.35  /* Create a new resource using the property values of a CMPI instance. */
   39.36 -int Xen_MemoryCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   39.37 +int Xen_MemoryCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   39.38  
    40.1 --- a/src/Xen_MemoryElementSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    40.2 +++ b/src/Xen_MemoryElementSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    40.3 @@ -15,7 +15,7 @@
    40.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    40.5  // ============================================================================
    40.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    40.7 -// Contributors:
    40.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    40.9  // Description:
   40.10  // ============================================================================
   40.11  
   40.12 @@ -32,7 +32,7 @@
   40.13  // ----------------------------------------------------------------------------
   40.14  
   40.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   40.16 -static CMPIBroker *_BROKER;
   40.17 +static const CMPIBroker *_BROKER;
   40.18  
   40.19  /* Include utility functions */
   40.20  #include "cmpiutil.h"
   40.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "SystemName"
   40.22  // ----------------------------------------------------------------------------
   40.23  static CMPIStatus AssociationCleanup(
   40.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   40.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   40.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   40.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   40.28  {
   40.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   40.30  
   40.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   40.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   40.33  
   40.34     /* Nothing needs to be done for cleanup. */
   40.35 -
   40.36 -exit:
   40.37     _SBLIM_RETURNSTATUS(status);
   40.38  }
   40.39  
   40.40 @@ -84,9 +83,9 @@ exit:
   40.41  // ----------------------------------------------------------------------------
   40.42  static CMPIStatus AssociatorNames(
   40.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   40.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   40.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   40.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   40.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   40.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   40.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   40.50  		const char * assocClass,
   40.51  		const char * resultClass,
   40.52  		const char * role,
   40.53 @@ -185,14 +184,14 @@ exit:
   40.54  // ----------------------------------------------------------------------------
   40.55  static CMPIStatus Associators(
   40.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   40.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   40.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   40.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   40.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   40.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   40.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   40.63  		const char *assocClass,
   40.64  		const char *resultClass,
   40.65  		const char *role,
   40.66  		const char *resultRole,
   40.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   40.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   40.69  {
   40.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   40.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   40.72 @@ -290,9 +289,9 @@ exit:
   40.73  // ----------------------------------------------------------------------------
   40.74  static CMPIStatus ReferenceNames(
   40.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   40.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   40.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   40.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   40.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   40.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   40.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   40.82  		const char *assocClass, 
   40.83  		const char *role)
   40.84  {
   40.85 @@ -403,12 +402,12 @@ exit:
   40.86  // ----------------------------------------------------------------------------
   40.87  static CMPIStatus References(
   40.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   40.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   40.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   40.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   40.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   40.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   40.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   40.95  		const char *assocClass,
   40.96  		const char *role,
   40.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   40.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   40.99  {
  40.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  40.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  40.102 @@ -518,15 +517,13 @@ exit:
  40.103  // ----------------------------------------------------------------------------
  40.104  static void AssociationInitialize(
  40.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  40.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  40.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  40.108  {
  40.109     _SBLIM_ENTER("AssociationInitialize");
  40.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  40.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  40.112  
  40.113     /* Nothing needs to be done to initialize this provider */
  40.114 -
  40.115 -exit:
  40.116     _SBLIM_RETURN();
  40.117  }
  40.118  
    41.1 --- a/src/Xen_MemoryPool.c	Fri Oct 20 13:20:15 2006 -0600
    41.2 +++ b/src/Xen_MemoryPool.c	Tue Oct 24 11:30:03 2006 -0600
    41.3 @@ -32,7 +32,7 @@
    41.4  // ----------------------------------------------------------------------------
    41.5  
    41.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    41.7 -static CMPIBroker *_BROKER;
    41.8 +static const CMPIBroker *_BROKER;
    41.9  
   41.10  /* Include utility functions */
   41.11  #include "cmpiutil.h"
   41.12 @@ -66,7 +66,8 @@ const static char * _KEYNAMES[] = {"Pool
   41.13  // ----------------------------------------------------------------------------
   41.14  static CMPIStatus Cleanup(
   41.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   41.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */        
   41.19  {
   41.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   41.21  
   41.22 @@ -75,8 +76,6 @@ static CMPIStatus Cleanup(
   41.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   41.24  
   41.25     /* Nothing needs to be done for cleanup. */
   41.26 -
   41.27 -exit:
   41.28     _SBLIM_RETURNSTATUS(status);
   41.29  }
   41.30  
   41.31 @@ -86,9 +85,9 @@ exit:
   41.32  // ----------------------------------------------------------------------------
   41.33  static CMPIStatus EnumInstanceNames(
   41.34  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   41.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   41.37 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   41.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   41.40 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   41.41  {
   41.42     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   41.43     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   41.44 @@ -171,9 +170,9 @@ exit:
   41.45  // ----------------------------------------------------------------------------
   41.46  static CMPIStatus EnumInstances(
   41.47  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   41.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   41.50 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   41.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   41.53 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   41.54  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   41.55  {
   41.56     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   41.57 @@ -257,9 +256,9 @@ exit:
   41.58  // ----------------------------------------------------------------------------
   41.59  static CMPIStatus GetInstance(
   41.60  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.61 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   41.62 -		CMPIResult * results,		/* [out] Results of this operation. */
   41.63 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.64 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.65 +		const CMPIResult * results,		/* [out] Results of this operation. */
   41.66 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.67  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   41.68  {
   41.69     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   41.70 @@ -347,10 +346,11 @@ exit:
   41.71  // ----------------------------------------------------------------------------
   41.72  static CMPIStatus SetInstance(
   41.73  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.74 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   41.75 -		CMPIResult * results,		/* [out] Results of this operation. */
   41.76 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.77 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   41.78 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.79 +		const CMPIResult * results,		/* [out] Results of this operation. */
   41.80 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.81 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   41.82 +        const char **properties)
   41.83  {
   41.84     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   41.85     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   41.86 @@ -424,10 +424,10 @@ exit:
   41.87  // ----------------------------------------------------------------------------
   41.88  static CMPIStatus CreateInstance(
   41.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   41.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   41.91 -		CMPIResult * results,		/* [out] Results of this operation. */
   41.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   41.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   41.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
   41.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   41.97 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   41.98  {
   41.99     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  41.100     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  41.101 @@ -508,9 +508,9 @@ exit:
  41.102  // ----------------------------------------------------------------------------
  41.103  static CMPIStatus DeleteInstance(
  41.104  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  41.105 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  41.106 -		CMPIResult * results,		/* [out] Results of this operation. */
  41.107 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  41.108 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  41.109 +		const CMPIResult * results,		/* [out] Results of this operation. */
  41.110 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  41.111  {
  41.112     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  41.113     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  41.114 @@ -584,11 +584,11 @@ exit:
  41.115  // ----------------------------------------------------------------------------
  41.116  static CMPIStatus ExecQuery(
  41.117  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  41.118 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  41.119 -		CMPIResult * results,		/* [out] Results of this operation. */
  41.120 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  41.121 -		char * language,		/* [in] Name of the query language. */
  41.122 -		char * query)			/* [in] Text of the query written in the query language. */
  41.123 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  41.124 +		const CMPIResult * results,		/* [out] Results of this operation. */
  41.125 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  41.126 +		const char * language,		/* [in] Name of the query language. */
  41.127 +		const char * query)			/* [in] Text of the query written in the query language. */
  41.128  {
  41.129     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  41.130     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  41.131 @@ -622,15 +622,13 @@ exit:
  41.132  // ----------------------------------------------------------------------------
  41.133  static void Initialize(
  41.134  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  41.135 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  41.136 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  41.137  {
  41.138     _SBLIM_ENTER("Initialize");
  41.139     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  41.140     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  41.141  
  41.142     /* Nothing needs to be done to initialize this provider */
  41.143 -
  41.144 -exit:
  41.145     _SBLIM_RETURN();
  41.146  }
  41.147  
    42.1 --- a/src/Xen_MemoryPoolComponent.c	Fri Oct 20 13:20:15 2006 -0600
    42.2 +++ b/src/Xen_MemoryPoolComponent.c	Tue Oct 24 11:30:03 2006 -0600
    42.3 @@ -32,7 +32,7 @@
    42.4  // ----------------------------------------------------------------------------
    42.5  
    42.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    42.7 -static CMPIBroker *_BROKER;
    42.8 +static const CMPIBroker *_BROKER;
    42.9  
   42.10  /* Include utility functions */
   42.11  #include "cmpiutil.h"
   42.12 @@ -77,7 +77,8 @@ static char * _OMC_CACHE_MEMORY_CLASS = 
   42.13  // ----------------------------------------------------------------------------
   42.14  static CMPIStatus AssociationCleanup(
   42.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   42.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   42.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   42.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   42.19  {
   42.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   42.21  
   42.22 @@ -86,8 +87,6 @@ static CMPIStatus AssociationCleanup(
   42.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   42.24  
   42.25     /* Nothing needs to be done for cleanup. */
   42.26 -
   42.27 -exit:
   42.28     _SBLIM_RETURNSTATUS(status);
   42.29  }
   42.30  
   42.31 @@ -97,9 +96,9 @@ exit:
   42.32  // ----------------------------------------------------------------------------
   42.33  static CMPIStatus AssociatorNames(
   42.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   42.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   42.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   42.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   42.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   42.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   42.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   42.41  		const char * assocClass,
   42.42  		const char * resultClass,
   42.43  		const char * role,
   42.44 @@ -204,14 +203,14 @@ exit:
   42.45  // ----------------------------------------------------------------------------
   42.46  static CMPIStatus Associators(
   42.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   42.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   42.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   42.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   42.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   42.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   42.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   42.54  		const char *assocClass,
   42.55  		const char *resultClass,
   42.56  		const char *role,
   42.57  		const char *resultRole,
   42.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   42.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   42.60  {
   42.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   42.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   42.63 @@ -313,9 +312,9 @@ exit:
   42.64  // ----------------------------------------------------------------------------
   42.65  static CMPIStatus ReferenceNames(
   42.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   42.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   42.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   42.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   42.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   42.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   42.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   42.73  		const char *assocClass, 
   42.74  		const char *role)
   42.75  {
   42.76 @@ -360,7 +359,7 @@ static CMPIStatus ReferenceNames(
   42.77        targetclass = _RHSCLASSNAME;
   42.78        targetnamespace = _RHSNAMESPACE;
   42.79        /* Refences of LHS class should always be in LHS namespace. */
   42.80 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   42.81 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   42.82     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   42.83        targetclass = _LHSCLASSNAME;
   42.84        targetnamespace = _LHSNAMESPACE;
   42.85 @@ -428,12 +427,12 @@ exit:
   42.86  // ----------------------------------------------------------------------------
   42.87  static CMPIStatus References(
   42.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   42.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   42.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   42.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   42.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   42.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   42.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   42.95  		const char *assocClass,
   42.96  		const char *role,
   42.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   42.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   42.99  {
  42.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  42.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  42.102 @@ -476,7 +475,7 @@ static CMPIStatus References(
  42.103        targetclass = _RHSCLASSNAME;
  42.104        targetnamespace = _RHSNAMESPACE;
  42.105        /* Refences of LHS class should always be in LHS namespace. */
  42.106 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  42.107 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  42.108     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  42.109        targetclass = _LHSCLASSNAME;
  42.110        targetnamespace = _LHSNAMESPACE;
  42.111 @@ -545,15 +544,13 @@ exit:
  42.112  // ----------------------------------------------------------------------------
  42.113  static void AssociationInitialize(
  42.114  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  42.115 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  42.116 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  42.117  {
  42.118     _SBLIM_ENTER("AssociationInitialize");
  42.119     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  42.120     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  42.121  
  42.122     /* Nothing needs to be done to initialize this provider */
  42.123 -
  42.124 -exit:
  42.125     _SBLIM_RETURN();
  42.126  }
  42.127  
    43.1 --- a/src/Xen_MemoryPool_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    43.2 +++ b/src/Xen_MemoryPool_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    43.3 @@ -15,8 +15,7 @@
    43.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    43.5  // ============================================================================
    43.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    43.7 -//                Jim Fehlig, <jfehlig@novell.com>
    43.8 -// Contributors:
    43.9 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
   43.10  // Description:
   43.11  // ============================================================================
   43.12  
   43.13 @@ -130,7 +129,7 @@ int Xen_MemoryPool_getNextResource( _RES
   43.14  // ----------------------------------------------------------------------------
   43.15  
   43.16  /* Get the specific resource that matches the CMPI object path. */
   43.17 -int Xen_MemoryPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   43.18 +int Xen_MemoryPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   43.19  {
   43.20     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   43.21  
   43.22 @@ -176,7 +175,7 @@ int Xen_MemoryPool_freeResource( _RESOUR
   43.23  // ---------------------------------------------------------------------------- 
   43.24  
   43.25  /* Set the property values of a CMPI instance from a specific resource. */
   43.26 -int Xen_MemoryPool_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   43.27 +int Xen_MemoryPool_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   43.28  {
   43.29     if (resource == NULL) return 0;
   43.30     if (CMIsNullObject(instance)) return 0;
   43.31 @@ -215,7 +214,7 @@ int Xen_MemoryPool_deleteResource( _RESO
   43.32  // ----------------------------------------------------------------------------
   43.33  
   43.34  /* Modify the specified resource using the property values of a CMPI instance. */
   43.35 -int Xen_MemoryPool_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   43.36 +int Xen_MemoryPool_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   43.37  {
   43.38     /* Unsupported. */
   43.39     return -1;
   43.40 @@ -224,7 +223,7 @@ int Xen_MemoryPool_setResourceFromInstan
   43.41  // ----------------------------------------------------------------------------
   43.42  
   43.43  /* Create a new resource using the property values of a CMPI instance. */
   43.44 -int Xen_MemoryPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   43.45 +int Xen_MemoryPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   43.46  {
   43.47     /* Unsupported. */
   43.48     return -1;
    44.1 --- a/src/Xen_MemoryPool_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    44.2 +++ b/src/Xen_MemoryPool_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    44.3 @@ -15,7 +15,7 @@
    44.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    44.5  // ============================================================================
    44.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    44.7 -// Contributors:
    44.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    44.9  // Description:
   44.10  // ============================================================================
   44.11  
   44.12 @@ -66,13 +66,13 @@ int Xen_MemoryPool_freeResources( _RESOU
   44.13  int Xen_MemoryPool_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   44.14  
   44.15  /* Get the specific resource that matches the CMPI object path. */
   44.16 -int Xen_MemoryPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   44.17 +int Xen_MemoryPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   44.18  
   44.19  /* Free/deallocate/cleanup a resource after use. */
   44.20  int Xen_MemoryPool_freeResource( _RESOURCE * resource );
   44.21  
   44.22  /* Set the property values of a CMPI instance from a specific resource. */
   44.23 -int Xen_MemoryPool_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   44.24 +int Xen_MemoryPool_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   44.25  
   44.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   44.27  
   44.28 @@ -80,8 +80,8 @@ int Xen_MemoryPool_setInstanceFromResour
   44.29  int Xen_MemoryPool_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   44.30  
   44.31  /* Modify the specified resource using the property values of a CMPI instance. */
   44.32 -int Xen_MemoryPool_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   44.33 +int Xen_MemoryPool_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   44.34  
   44.35  /* Create a new resource using the property values of a CMPI instance. */
   44.36 -int Xen_MemoryPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   44.37 +int Xen_MemoryPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   44.38  
    45.1 --- a/src/Xen_MemorySettingAllocationFromPool.c	Fri Oct 20 13:20:15 2006 -0600
    45.2 +++ b/src/Xen_MemorySettingAllocationFromPool.c	Tue Oct 24 11:30:03 2006 -0600
    45.3 @@ -32,7 +32,7 @@
    45.4  // ----------------------------------------------------------------------------
    45.5  
    45.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    45.7 -static CMPIBroker *_BROKER;
    45.8 +static const CMPIBroker *_BROKER;
    45.9  
   45.10  /* Include utility functions */
   45.11  #include "cmpiutil.h"
   45.12 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Depend
   45.13  // ----------------------------------------------------------------------------
   45.14  static CMPIStatus AssociationCleanup(
   45.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   45.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   45.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   45.19  {
   45.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   45.21  
   45.22 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   45.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   45.24  
   45.25     /* Nothing needs to be done for cleanup. */
   45.26 -
   45.27 -exit:
   45.28     _SBLIM_RETURNSTATUS(status);
   45.29  }
   45.30  
   45.31 @@ -83,9 +82,9 @@ exit:
   45.32  // ----------------------------------------------------------------------------
   45.33  static CMPIStatus AssociatorNames(
   45.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   45.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   45.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   45.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   45.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   45.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   45.41  		const char * assocClass,
   45.42  		const char * resultClass,
   45.43  		const char * role,
   45.44 @@ -171,14 +170,14 @@ exit:
   45.45  // ----------------------------------------------------------------------------
   45.46  static CMPIStatus Associators(
   45.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   45.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   45.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   45.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   45.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   45.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   45.54  		const char *assocClass,
   45.55  		const char *resultClass,
   45.56  		const char *role,
   45.57  		const char *resultRole,
   45.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   45.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   45.60  {
   45.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   45.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   45.63 @@ -263,9 +262,9 @@ exit:
   45.64  // ----------------------------------------------------------------------------
   45.65  static CMPIStatus ReferenceNames(
   45.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   45.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   45.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   45.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   45.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   45.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   45.73  		const char *assocClass, 
   45.74  		const char *role)
   45.75  {
   45.76 @@ -361,12 +360,12 @@ exit:
   45.77  // ----------------------------------------------------------------------------
   45.78  static CMPIStatus References(
   45.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   45.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   45.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   45.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   45.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   45.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   45.86  		const char *assocClass,
   45.87  		const char *role,
   45.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   45.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   45.90  {
   45.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   45.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   45.93 @@ -462,15 +461,13 @@ exit:
   45.94  // ----------------------------------------------------------------------------
   45.95  static void AssociationInitialize(
   45.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   45.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   45.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   45.99  {
  45.100     _SBLIM_ENTER("AssociationInitialize");
  45.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  45.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  45.103  
  45.104     /* Nothing needs to be done to initialize this provider */
  45.105 -
  45.106 -exit:
  45.107     _SBLIM_RETURN();
  45.108  }
  45.109  
    46.1 --- a/src/Xen_MemorySettingData.c	Fri Oct 20 13:20:15 2006 -0600
    46.2 +++ b/src/Xen_MemorySettingData.c	Tue Oct 24 11:30:03 2006 -0600
    46.3 @@ -15,7 +15,7 @@
    46.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    46.5  // ============================================================================
    46.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    46.7 -// Contributors:
    46.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    46.9  // Description:
   46.10  // ============================================================================
   46.11  
   46.12 @@ -30,7 +30,7 @@
   46.13  // ----------------------------------------------------------------------------
   46.14  
   46.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   46.16 -static CMPIBroker *_BROKER;
   46.17 +static const CMPIBroker *_BROKER;
   46.18  
   46.19  /* Include utility functions */
   46.20  #include "cmpiutil.h"
   46.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   46.22  // ----------------------------------------------------------------------------
   46.23  static CMPIStatus Cleanup(
   46.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   46.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   46.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   46.28  {
   46.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   46.30  
   46.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   46.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   46.33  
   46.34     /* Nothing needs to be done for cleanup. */
   46.35 -
   46.36 -exit:
   46.37     _SBLIM_RETURNSTATUS(status);
   46.38  }
   46.39  
   46.40 @@ -84,9 +83,9 @@ exit:
   46.41  // ----------------------------------------------------------------------------
   46.42  static CMPIStatus EnumInstanceNames(
   46.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   46.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   46.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   46.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   46.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   46.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   46.50  {
   46.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   46.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   46.53 @@ -164,9 +163,9 @@ exit:
   46.54  // ----------------------------------------------------------------------------
   46.55  static CMPIStatus EnumInstances(
   46.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   46.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   46.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   46.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   46.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   46.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   46.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   46.64  {
   46.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   46.66 @@ -245,9 +244,9 @@ exit:
   46.67  // ----------------------------------------------------------------------------
   46.68  static CMPIStatus GetInstance(
   46.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   46.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   46.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   46.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   46.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   46.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   46.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   46.77  {
   46.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   46.79 @@ -330,10 +329,11 @@ exit:
   46.80  // ----------------------------------------------------------------------------
   46.81  static CMPIStatus SetInstance(
   46.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   46.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   46.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   46.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   46.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   46.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   46.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   46.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   46.91 +        const char **properties)
   46.92  {
   46.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   46.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   46.95 @@ -402,10 +402,10 @@ exit:
   46.96  // ----------------------------------------------------------------------------
   46.97  static CMPIStatus CreateInstance(
   46.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   46.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  46.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  46.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  46.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  46.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  46.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  46.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  46.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  46.107  {
  46.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  46.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  46.110 @@ -481,9 +481,9 @@ exit:
  46.111  // ----------------------------------------------------------------------------
  46.112  static CMPIStatus DeleteInstance(
  46.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  46.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  46.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  46.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  46.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  46.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  46.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  46.120  {
  46.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  46.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  46.123 @@ -552,11 +552,11 @@ exit:
  46.124  // ----------------------------------------------------------------------------
  46.125  static CMPIStatus ExecQuery(
  46.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  46.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  46.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  46.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  46.130 -		char * language,		/* [in] Name of the query language. */
  46.131 -		char * query)			/* [in] Text of the query written in the query language. */
  46.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  46.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  46.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  46.135 +		const char * language,		/* [in] Name of the query language. */
  46.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  46.137  {
  46.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  46.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  46.140 @@ -585,15 +585,13 @@ exit:
  46.141  // ----------------------------------------------------------------------------
  46.142  static void Initialize(
  46.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  46.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  46.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  46.146  {
  46.147     _SBLIM_ENTER("Initialize");
  46.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  46.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  46.150  
  46.151     /* Nothing needs to be done to initialize this provider */
  46.152 -
  46.153 -exit:
  46.154     _SBLIM_RETURN();
  46.155  }
  46.156  
    47.1 --- a/src/Xen_MemorySettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    47.2 +++ b/src/Xen_MemorySettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    47.3 @@ -15,7 +15,7 @@
    47.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    47.5  // ============================================================================
    47.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    47.7 -// Contributors:
    47.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    47.9  // Description:
   47.10  // ============================================================================
   47.11  
   47.12 @@ -108,7 +108,7 @@ int Xen_MemorySettingData_getNextResourc
   47.13  // ----------------------------------------------------------------------------
   47.14  
   47.15  /* Get the specific resource that matches the CMPI object path. */
   47.16 -int Xen_MemorySettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   47.17 +int Xen_MemorySettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   47.18  {
   47.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   47.20  
   47.21 @@ -148,7 +148,7 @@ int Xen_MemorySettingData_freeResource( 
   47.22  // ---------------------------------------------------------------------------- 
   47.23  
   47.24  /* Set the property values of a CMPI instance from a specific resource. */
   47.25 -int Xen_MemorySettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   47.26 +int Xen_MemorySettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   47.27  {
   47.28     int i;
   47.29     int instIdLen;
   47.30 @@ -213,7 +213,7 @@ int Xen_MemorySettingData_deleteResource
   47.31  // ----------------------------------------------------------------------------
   47.32  
   47.33  /* Modify the specified resource using the property values of a CMPI instance. */
   47.34 -int Xen_MemorySettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   47.35 +int Xen_MemorySettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   47.36  {
   47.37     /* Unsupported. */
   47.38     return -1;
   47.39 @@ -222,7 +222,7 @@ int Xen_MemorySettingData_setResourceFro
   47.40  // ----------------------------------------------------------------------------
   47.41  
   47.42  /* Create a new resource using the property values of a CMPI instance. */
   47.43 -int Xen_MemorySettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   47.44 +int Xen_MemorySettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   47.45  {
   47.46     /* Unsupported. */
   47.47     return -1;
    48.1 --- a/src/Xen_MemorySettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    48.2 +++ b/src/Xen_MemorySettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    48.3 @@ -15,7 +15,7 @@
    48.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    48.5  // ============================================================================
    48.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    48.7 -// Contributors:
    48.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    48.9  // Description:
   48.10  // ============================================================================
   48.11  
   48.12 @@ -66,13 +66,13 @@ int Xen_MemorySettingData_freeResources(
   48.13  int Xen_MemorySettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   48.14  
   48.15  /* Get the specific resource that matches the CMPI object path. */
   48.16 -int Xen_MemorySettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   48.17 +int Xen_MemorySettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   48.18  
   48.19  /* Free/deallocate/cleanup a resource after use. */
   48.20  int Xen_MemorySettingData_freeResource( _RESOURCE * resource );
   48.21  
   48.22  /* Set the property values of a CMPI instance from a specific resource. */
   48.23 -int Xen_MemorySettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   48.24 +int Xen_MemorySettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   48.25  
   48.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   48.27  
   48.28 @@ -80,8 +80,8 @@ int Xen_MemorySettingData_setInstanceFro
   48.29  int Xen_MemorySettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   48.30  
   48.31  /* Modify the specified resource using the property values of a CMPI instance. */
   48.32 -int Xen_MemorySettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   48.33 +int Xen_MemorySettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   48.34  
   48.35  /* Create a new resource using the property values of a CMPI instance. */
   48.36 -int Xen_MemorySettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   48.37 +int Xen_MemorySettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   48.38  
    49.1 --- a/src/Xen_Memory_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    49.2 +++ b/src/Xen_Memory_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    49.3 @@ -16,10 +16,12 @@
    49.4  // ============================================================================
    49.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    49.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    49.7 -// Contributors:
    49.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    49.9  // Description:
   49.10  // ============================================================================
   49.11  
   49.12 +#include <stdlib.h>
   49.13 +
   49.14  #include "Xen_Memory_Resource.h"
   49.15  
   49.16  /* Include the required CMPI data types, function headers, and macros. */
   49.17 @@ -103,7 +105,7 @@ int Xen_Memory_getNextResource( _RESOURC
   49.18  // ----------------------------------------------------------------------------
   49.19  
   49.20  /* Get the specific resource that matches the CMPI object path. */
   49.21 -int Xen_Memory_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   49.22 +int Xen_Memory_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   49.23  {
   49.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   49.25  
   49.26 @@ -141,7 +143,7 @@ int Xen_Memory_freeResource( _RESOURCE *
   49.27  // ---------------------------------------------------------------------------- 
   49.28  
   49.29  /* Set the property values of a CMPI instance from a specific resource. */
   49.30 -int Xen_Memory_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   49.31 +int Xen_Memory_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   49.32  {
   49.33     if (resource == NULL) return 0;
   49.34     if (CMIsNullObject(instance)) return 0;
   49.35 @@ -186,7 +188,7 @@ int Xen_Memory_deleteResource( _RESOURCE
   49.36  // ----------------------------------------------------------------------------
   49.37  
   49.38  /* Modify the specified resource using the property values of a CMPI instance. */
   49.39 -int Xen_Memory_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   49.40 +int Xen_Memory_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   49.41  {
   49.42     /* TODO - support ballooning DomU memory here */
   49.43  
   49.44 @@ -197,7 +199,7 @@ int Xen_Memory_setResourceFromInstance( 
   49.45  // ----------------------------------------------------------------------------
   49.46  
   49.47  /* Create a new resource using the property values of a CMPI instance. */
   49.48 -int Xen_Memory_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   49.49 +int Xen_Memory_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   49.50  {
   49.51     /* Unsupported. */
   49.52     return -1;
    50.1 --- a/src/Xen_Memory_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    50.2 +++ b/src/Xen_Memory_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    50.3 @@ -16,7 +16,7 @@
    50.4  // ============================================================================
    50.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    50.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    50.7 -// Contributors:
    50.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    50.9  // Description:
   50.10  // ============================================================================
   50.11  
   50.12 @@ -67,13 +67,13 @@ int Xen_Memory_freeResources( _RESOURCES
   50.13  int Xen_Memory_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   50.14  
   50.15  /* Get the specific resource that matches the CMPI object path. */
   50.16 -int Xen_Memory_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   50.17 +int Xen_Memory_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   50.18  
   50.19  /* Free/deallocate/cleanup a resource after use. */
   50.20  int Xen_Memory_freeResource( _RESOURCE * resource );
   50.21  
   50.22  /* Set the property values of a CMPI instance from a specific resource. */
   50.23 -int Xen_Memory_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   50.24 +int Xen_Memory_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   50.25  
   50.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   50.27  
   50.28 @@ -81,8 +81,8 @@ int Xen_Memory_setInstanceFromResource( 
   50.29  int Xen_Memory_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   50.30  
   50.31  /* Modify the specified resource using the property values of a CMPI instance. */
   50.32 -int Xen_Memory_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   50.33 +int Xen_Memory_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   50.34  
   50.35  /* Create a new resource using the property values of a CMPI instance. */
   50.36 -int Xen_Memory_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   50.37 +int Xen_Memory_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   50.38  
    51.1 --- a/src/Xen_NetworkPort.c	Fri Oct 20 13:20:15 2006 -0600
    51.2 +++ b/src/Xen_NetworkPort.c	Tue Oct 24 11:30:03 2006 -0600
    51.3 @@ -16,7 +16,7 @@
    51.4  // ============================================================================
    51.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    51.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    51.7 -// Contributors:
    51.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    51.9  // Description:
   51.10  // ============================================================================
   51.11  
   51.12 @@ -31,7 +31,7 @@
   51.13  // ----------------------------------------------------------------------------
   51.14  
   51.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   51.16 -static CMPIBroker *_BROKER;
   51.17 +static const CMPIBroker *_BROKER;
   51.18  
   51.19  /* Include utility functions */
   51.20  #include "cmpiutil.h"
   51.21 @@ -65,7 +65,8 @@ const static char * _KEYNAMES[] = {"Syst
   51.22  // ----------------------------------------------------------------------------
   51.23  static CMPIStatus Cleanup(
   51.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   51.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   51.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   51.28  {
   51.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   51.30  
   51.31 @@ -74,8 +75,6 @@ static CMPIStatus Cleanup(
   51.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   51.33  
   51.34     /* Nothing needs to be done for cleanup. */
   51.35 -
   51.36 -exit:
   51.37     _SBLIM_RETURNSTATUS(status);
   51.38  }
   51.39  
   51.40 @@ -85,9 +84,9 @@ exit:
   51.41  // ----------------------------------------------------------------------------
   51.42  static CMPIStatus EnumInstanceNames(
   51.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   51.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   51.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   51.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   51.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   51.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   51.50  {
   51.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   51.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   51.53 @@ -165,9 +164,9 @@ exit:
   51.54  // ----------------------------------------------------------------------------
   51.55  static CMPIStatus EnumInstances(
   51.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   51.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   51.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   51.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   51.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   51.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   51.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   51.64  {
   51.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   51.66 @@ -246,9 +245,9 @@ exit:
   51.67  // ----------------------------------------------------------------------------
   51.68  static CMPIStatus GetInstance(
   51.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   51.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   51.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   51.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   51.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   51.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   51.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   51.77  {
   51.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   51.79 @@ -331,10 +330,11 @@ exit:
   51.80  // ----------------------------------------------------------------------------
   51.81  static CMPIStatus SetInstance(
   51.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   51.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   51.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   51.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   51.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   51.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   51.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   51.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   51.91 +        const char **properties)
   51.92  {
   51.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   51.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   51.95 @@ -403,10 +403,10 @@ exit:
   51.96  // ----------------------------------------------------------------------------
   51.97  static CMPIStatus CreateInstance(
   51.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   51.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  51.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  51.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  51.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  51.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  51.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  51.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  51.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  51.107  {
  51.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  51.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  51.110 @@ -482,9 +482,9 @@ exit:
  51.111  // ----------------------------------------------------------------------------
  51.112  static CMPIStatus DeleteInstance(
  51.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  51.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  51.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  51.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  51.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  51.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  51.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  51.120  {
  51.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  51.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  51.123 @@ -553,11 +553,11 @@ exit:
  51.124  // ----------------------------------------------------------------------------
  51.125  static CMPIStatus ExecQuery(
  51.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  51.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  51.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  51.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  51.130 -		char * language,		/* [in] Name of the query language. */
  51.131 -		char * query)			/* [in] Text of the query written in the query language. */
  51.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  51.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  51.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  51.135 +		const char * language,		/* [in] Name of the query language. */
  51.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  51.137  {
  51.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  51.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  51.140 @@ -586,15 +586,13 @@ exit:
  51.141  // ----------------------------------------------------------------------------
  51.142  static void Initialize(
  51.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  51.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  51.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  51.146  {
  51.147     _SBLIM_ENTER("Initialize");
  51.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  51.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  51.150  
  51.151     /* Nothing needs to be done to initialize this provider */
  51.152 -
  51.153 -exit:
  51.154     _SBLIM_RETURN();
  51.155  }
  51.156  
    52.1 --- a/src/Xen_NetworkPortElementSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    52.2 +++ b/src/Xen_NetworkPortElementSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    52.3 @@ -15,7 +15,7 @@
    52.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    52.5  // ============================================================================
    52.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    52.7 -// Contributors:
    52.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    52.9  // Description:
   52.10  // ============================================================================
   52.11  
   52.12 @@ -32,7 +32,7 @@
   52.13  // ----------------------------------------------------------------------------
   52.14  
   52.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   52.16 -static CMPIBroker *_BROKER;
   52.17 +static const CMPIBroker *_BROKER;
   52.18  
   52.19  /* Include utility functions */
   52.20  #include "cmpiutil.h"
   52.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "SystemName"
   52.22  // ----------------------------------------------------------------------------
   52.23  static CMPIStatus AssociationCleanup(
   52.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   52.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   52.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   52.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   52.28  {
   52.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   52.30  
   52.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   52.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   52.33  
   52.34     /* Nothing needs to be done for cleanup. */
   52.35 -
   52.36 -exit:
   52.37     _SBLIM_RETURNSTATUS(status);
   52.38  }
   52.39  
   52.40 @@ -84,9 +83,9 @@ exit:
   52.41  // ----------------------------------------------------------------------------
   52.42  static CMPIStatus AssociatorNames(
   52.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   52.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   52.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   52.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   52.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   52.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   52.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   52.50  		const char * assocClass,
   52.51  		const char * resultClass,
   52.52  		const char * role,
   52.53 @@ -185,14 +184,14 @@ exit:
   52.54  // ----------------------------------------------------------------------------
   52.55  static CMPIStatus Associators(
   52.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   52.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   52.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   52.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   52.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   52.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   52.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   52.63  		const char *assocClass,
   52.64  		const char *resultClass,
   52.65  		const char *role,
   52.66  		const char *resultRole,
   52.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   52.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   52.69  {
   52.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   52.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   52.72 @@ -290,9 +289,9 @@ exit:
   52.73  // ----------------------------------------------------------------------------
   52.74  static CMPIStatus ReferenceNames(
   52.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   52.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   52.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   52.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   52.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   52.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   52.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   52.82  		const char *assocClass, 
   52.83  		const char *role)
   52.84  {
   52.85 @@ -403,12 +402,12 @@ exit:
   52.86  // ----------------------------------------------------------------------------
   52.87  static CMPIStatus References(
   52.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   52.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   52.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   52.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   52.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   52.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   52.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   52.95  		const char *assocClass,
   52.96  		const char *role,
   52.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   52.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   52.99  {
  52.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  52.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  52.102 @@ -518,15 +517,13 @@ exit:
  52.103  // ----------------------------------------------------------------------------
  52.104  static void AssociationInitialize(
  52.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  52.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  52.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  52.108  {
  52.109     _SBLIM_ENTER("AssociationInitialize");
  52.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  52.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  52.112  
  52.113     /* Nothing needs to be done to initialize this provider */
  52.114 -
  52.115 -exit:
  52.116     _SBLIM_RETURN();
  52.117  }
  52.118  
    53.1 --- a/src/Xen_NetworkPortSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    53.2 +++ b/src/Xen_NetworkPortSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    53.3 @@ -15,7 +15,7 @@
    53.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    53.5  // ============================================================================
    53.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    53.7 -// Contributors:
    53.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    53.9  // Description:
   53.10  // ============================================================================
   53.11  
   53.12 @@ -30,7 +30,7 @@
   53.13  // ----------------------------------------------------------------------------
   53.14  
   53.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   53.16 -static CMPIBroker *_BROKER;
   53.17 +static const CMPIBroker *_BROKER;
   53.18  
   53.19  /* Include utility functions */
   53.20  #include "cmpiutil.h"
   53.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   53.22  // ----------------------------------------------------------------------------
   53.23  static CMPIStatus Cleanup(
   53.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   53.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   53.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   53.28  {
   53.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   53.30  
   53.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   53.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   53.33  
   53.34     /* Nothing needs to be done for cleanup. */
   53.35 -
   53.36 -exit:
   53.37     _SBLIM_RETURNSTATUS(status);
   53.38  }
   53.39  
   53.40 @@ -84,9 +83,9 @@ exit:
   53.41  // ----------------------------------------------------------------------------
   53.42  static CMPIStatus EnumInstanceNames(
   53.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   53.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   53.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   53.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   53.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   53.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   53.50  {
   53.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   53.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   53.53 @@ -164,9 +163,9 @@ exit:
   53.54  // ----------------------------------------------------------------------------
   53.55  static CMPIStatus EnumInstances(
   53.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   53.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   53.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   53.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   53.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   53.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   53.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   53.64  {
   53.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   53.66 @@ -245,9 +244,9 @@ exit:
   53.67  // ----------------------------------------------------------------------------
   53.68  static CMPIStatus GetInstance(
   53.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   53.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   53.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   53.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   53.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   53.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   53.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   53.77  {
   53.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   53.79 @@ -330,10 +329,11 @@ exit:
   53.80  // ----------------------------------------------------------------------------
   53.81  static CMPIStatus SetInstance(
   53.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   53.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   53.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   53.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   53.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   53.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   53.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   53.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   53.91 +        const char **properties)
   53.92  {
   53.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   53.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   53.95 @@ -402,10 +402,10 @@ exit:
   53.96  // ----------------------------------------------------------------------------
   53.97  static CMPIStatus CreateInstance(
   53.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   53.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  53.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  53.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  53.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  53.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  53.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  53.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  53.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  53.107  {
  53.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  53.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  53.110 @@ -481,9 +481,9 @@ exit:
  53.111  // ----------------------------------------------------------------------------
  53.112  static CMPIStatus DeleteInstance(
  53.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  53.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  53.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  53.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  53.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  53.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  53.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  53.120  {
  53.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  53.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  53.123 @@ -552,11 +552,11 @@ exit:
  53.124  // ----------------------------------------------------------------------------
  53.125  static CMPIStatus ExecQuery(
  53.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  53.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  53.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  53.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  53.130 -		char * language,		/* [in] Name of the query language. */
  53.131 -		char * query)			/* [in] Text of the query written in the query language. */
  53.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  53.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  53.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  53.135 +		const char * language,		/* [in] Name of the query language. */
  53.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  53.137  {
  53.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  53.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  53.140 @@ -585,15 +585,13 @@ exit:
  53.141  // ----------------------------------------------------------------------------
  53.142  static void Initialize(
  53.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  53.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  53.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  53.146  {
  53.147     _SBLIM_ENTER("Initialize");
  53.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  53.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  53.150  
  53.151     /* Nothing needs to be done to initialize this provider */
  53.152 -
  53.153 -exit:
  53.154     _SBLIM_RETURN();
  53.155  }
  53.156  
    54.1 --- a/src/Xen_NetworkPortSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    54.2 +++ b/src/Xen_NetworkPortSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    54.3 @@ -16,7 +16,7 @@
    54.4  // ============================================================================
    54.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    54.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    54.7 -// Contributors:
    54.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    54.9  // Description:
   54.10  // ============================================================================
   54.11  
   54.12 @@ -109,7 +109,7 @@ int Xen_NetworkPortSettingData_getNextRe
   54.13  // ----------------------------------------------------------------------------
   54.14  
   54.15  /* Get the specific resource that matches the CMPI object path. */
   54.16 -int Xen_NetworkPortSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   54.17 +int Xen_NetworkPortSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   54.18  {
   54.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   54.20  
   54.21 @@ -149,7 +149,7 @@ int Xen_NetworkPortSettingData_freeResou
   54.22  // ---------------------------------------------------------------------------- 
   54.23  
   54.24  /* Set the property values of a CMPI instance from a specific resource. */
   54.25 -int Xen_NetworkPortSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   54.26 +int Xen_NetworkPortSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   54.27  {
   54.28     int i;
   54.29     int instIdLen;
   54.30 @@ -206,7 +206,7 @@ int Xen_NetworkPortSettingData_deleteRes
   54.31  // ----------------------------------------------------------------------------
   54.32  
   54.33  /* Modify the specified resource using the property values of a CMPI instance. */
   54.34 -int Xen_NetworkPortSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   54.35 +int Xen_NetworkPortSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   54.36  {
   54.37     /* Unsupported. */
   54.38     return -1;
   54.39 @@ -215,7 +215,7 @@ int Xen_NetworkPortSettingData_setResour
   54.40  // ----------------------------------------------------------------------------
   54.41  
   54.42  /* Create a new resource using the property values of a CMPI instance. */
   54.43 -int Xen_NetworkPortSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   54.44 +int Xen_NetworkPortSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   54.45  {
   54.46     /* Unsupported. */
   54.47     return -1;
    55.1 --- a/src/Xen_NetworkPortSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    55.2 +++ b/src/Xen_NetworkPortSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    55.3 @@ -16,7 +16,7 @@
    55.4  // ============================================================================
    55.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    55.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    55.7 -// Contributors:
    55.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    55.9  // Description:
   55.10  // ============================================================================
   55.11  
   55.12 @@ -67,13 +67,13 @@ int Xen_NetworkPortSettingData_freeResou
   55.13  int Xen_NetworkPortSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   55.14  
   55.15  /* Get the specific resource that matches the CMPI object path. */
   55.16 -int Xen_NetworkPortSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   55.17 +int Xen_NetworkPortSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   55.18  
   55.19  /* Free/deallocate/cleanup a resource after use. */
   55.20  int Xen_NetworkPortSettingData_freeResource( _RESOURCE * resource );
   55.21  
   55.22  /* Set the property values of a CMPI instance from a specific resource. */
   55.23 -int Xen_NetworkPortSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   55.24 +int Xen_NetworkPortSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   55.25  
   55.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   55.27  
   55.28 @@ -81,8 +81,8 @@ int Xen_NetworkPortSettingData_setInstan
   55.29  int Xen_NetworkPortSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   55.30  
   55.31  /* Modify the specified resource using the property values of a CMPI instance. */
   55.32 -int Xen_NetworkPortSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   55.33 +int Xen_NetworkPortSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   55.34  
   55.35  /* Create a new resource using the property values of a CMPI instance. */
   55.36 -int Xen_NetworkPortSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   55.37 +int Xen_NetworkPortSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   55.38  
    56.1 --- a/src/Xen_NetworkPort_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    56.2 +++ b/src/Xen_NetworkPort_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    56.3 @@ -16,7 +16,7 @@
    56.4  // ============================================================================
    56.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    56.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    56.7 -// Contributors:
    56.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    56.9  // Description:
   56.10  // ============================================================================
   56.11  
   56.12 @@ -112,7 +112,7 @@ int Xen_NetworkPort_getNextResource( _RE
   56.13  // ----------------------------------------------------------------------------
   56.14  
   56.15  /* Get the specific resource that matches the CMPI object path. */
   56.16 -int Xen_NetworkPort_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   56.17 +int Xen_NetworkPort_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   56.18  {
   56.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   56.20  
   56.21 @@ -150,7 +150,7 @@ int Xen_NetworkPort_freeResource( _RESOU
   56.22  // ---------------------------------------------------------------------------- 
   56.23  
   56.24  /* Set the property values of a CMPI instance from a specific resource. */
   56.25 -int Xen_NetworkPort_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   56.26 +int Xen_NetworkPort_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   56.27  {
   56.28     CMPIArray * ips = CMNewArray(broker, 1, CMPI_chars, NULL);
   56.29   
   56.30 @@ -240,7 +240,7 @@ int Xen_NetworkPort_deleteResource( _RES
   56.31  // ----------------------------------------------------------------------------
   56.32  
   56.33  /* Modify the specified resource using the property values of a CMPI instance. */
   56.34 -int Xen_NetworkPort_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   56.35 +int Xen_NetworkPort_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   56.36  {
   56.37     /* Unsupported. */
   56.38     return -1;
   56.39 @@ -249,7 +249,7 @@ int Xen_NetworkPort_setResourceFromInsta
   56.40  // ----------------------------------------------------------------------------
   56.41  
   56.42  /* Create a new resource using the property values of a CMPI instance. */
   56.43 -int Xen_NetworkPort_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   56.44 +int Xen_NetworkPort_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   56.45  {
   56.46     /* Unsupported. */
   56.47     return -1;
    57.1 --- a/src/Xen_NetworkPort_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    57.2 +++ b/src/Xen_NetworkPort_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    57.3 @@ -16,7 +16,7 @@
    57.4  // ============================================================================
    57.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    57.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    57.7 -// Contributors:
    57.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    57.9  // Description:
   57.10  // ============================================================================
   57.11  
   57.12 @@ -68,13 +68,13 @@ int Xen_NetworkPort_freeResources( _RESO
   57.13  int Xen_NetworkPort_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   57.14  
   57.15  /* Get the specific resource that matches the CMPI object path. */
   57.16 -int Xen_NetworkPort_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   57.17 +int Xen_NetworkPort_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   57.18  
   57.19  /* Free/deallocate/cleanup a resource after use. */
   57.20  int Xen_NetworkPort_freeResource( _RESOURCE * resource );
   57.21  
   57.22  /* Set the property values of a CMPI instance from a specific resource. */
   57.23 -int Xen_NetworkPort_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   57.24 +int Xen_NetworkPort_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   57.25  
   57.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   57.27  
   57.28 @@ -82,8 +82,8 @@ int Xen_NetworkPort_setInstanceFromResou
   57.29  int Xen_NetworkPort_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   57.30  
   57.31  /* Modify the specified resource using the property values of a CMPI instance. */
   57.32 -int Xen_NetworkPort_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   57.33 +int Xen_NetworkPort_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   57.34  
   57.35  /* Create a new resource using the property values of a CMPI instance. */
   57.36 -int Xen_NetworkPort_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   57.37 +int Xen_NetworkPort_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   57.38  
    58.1 --- a/src/Xen_OperatingSystem.c	Fri Oct 20 13:20:15 2006 -0600
    58.2 +++ b/src/Xen_OperatingSystem.c	Tue Oct 24 11:30:03 2006 -0600
    58.3 @@ -15,7 +15,7 @@
    58.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    58.5  // ============================================================================
    58.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    58.7 -// Contributors:
    58.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    58.9  // Description:
   58.10  // ============================================================================
   58.11  
   58.12 @@ -32,7 +32,7 @@
   58.13  // ----------------------------------------------------------------------------
   58.14  
   58.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   58.16 -static CMPIBroker *_BROKER;
   58.17 +static const CMPIBroker *_BROKER;
   58.18  
   58.19  /* Include utility functions */
   58.20  #include "cmpiutil.h"
   58.21 @@ -66,7 +66,8 @@ const static char * _KEYNAMES[] = {"CSNa
   58.22  // ----------------------------------------------------------------------------
   58.23  static CMPIStatus Cleanup(
   58.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   58.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   58.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   58.28  {
   58.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   58.30  
   58.31 @@ -75,8 +76,6 @@ static CMPIStatus Cleanup(
   58.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   58.33  
   58.34     /* Nothing needs to be done for cleanup. */
   58.35 -
   58.36 -exit:
   58.37     _SBLIM_RETURNSTATUS(status);
   58.38  }
   58.39  
   58.40 @@ -86,9 +85,9 @@ exit:
   58.41  // ----------------------------------------------------------------------------
   58.42  static CMPIStatus EnumInstanceNames(
   58.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   58.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   58.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   58.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   58.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   58.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   58.50  {
   58.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   58.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   58.53 @@ -166,9 +165,9 @@ exit:
   58.54  // ----------------------------------------------------------------------------
   58.55  static CMPIStatus EnumInstances(
   58.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   58.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   58.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   58.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   58.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   58.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   58.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   58.64  {
   58.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   58.66 @@ -247,9 +246,9 @@ exit:
   58.67  // ----------------------------------------------------------------------------
   58.68  static CMPIStatus GetInstance(
   58.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   58.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   58.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   58.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   58.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   58.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   58.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   58.77  {
   58.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   58.79 @@ -332,10 +331,11 @@ exit:
   58.80  // ----------------------------------------------------------------------------
   58.81  static CMPIStatus SetInstance(
   58.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   58.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   58.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   58.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   58.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   58.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   58.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   58.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   58.91 +        const char **properties)
   58.92  {
   58.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   58.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   58.95 @@ -404,10 +404,10 @@ exit:
   58.96  // ----------------------------------------------------------------------------
   58.97  static CMPIStatus CreateInstance(
   58.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   58.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  58.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  58.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  58.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  58.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  58.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  58.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  58.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  58.107  {
  58.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  58.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  58.110 @@ -483,9 +483,9 @@ exit:
  58.111  // ----------------------------------------------------------------------------
  58.112  static CMPIStatus DeleteInstance(
  58.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  58.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  58.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  58.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  58.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  58.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  58.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  58.120  {
  58.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  58.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  58.123 @@ -554,11 +554,11 @@ exit:
  58.124  // ----------------------------------------------------------------------------
  58.125  static CMPIStatus ExecQuery(
  58.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  58.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  58.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  58.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  58.130 -		char * language,		/* [in] Name of the query language. */
  58.131 -		char * query)			/* [in] Text of the query written in the query language. */
  58.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  58.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  58.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  58.135 +		const char * language,		/* [in] Name of the query language. */
  58.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  58.137  {
  58.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  58.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  58.140 @@ -587,15 +587,13 @@ exit:
  58.141  // ----------------------------------------------------------------------------
  58.142  static void Initialize(
  58.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  58.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  58.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  58.146  {
  58.147     _SBLIM_ENTER("Initialize");
  58.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  58.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  58.150  
  58.151     /* Nothing needs to be done to initialize this provider */
  58.152 -
  58.153 -exit:
  58.154     _SBLIM_RETURN();
  58.155  }
  58.156  
  58.157 @@ -614,8 +612,9 @@ CMInstanceMIStub( , Xen_OperatingSystem,
  58.158  // Perform any necessary cleanup immediately before this provider is unloaded.
  58.159  // ----------------------------------------------------------------------------
  58.160  static CMPIStatus MethodCleanup(
  58.161 -                CMPIInstanceMI * self,          /* [in] Handle to this provider (i.e. 'self'). */
  58.162 -                CMPIContext * context)          /* [in] Additional context info, if any. */
  58.163 +                CMPIMethodMI * self,          /* [in] Handle to this provider (i.e. 'self'). */
  58.164 +                const CMPIContext * context,          /* [in] Additional context info, if any. */
  58.165 +                CMPIBoolean terminating)   /* [in] True if MB is terminating */
  58.166  {
  58.167     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  58.168  
  58.169 @@ -624,8 +623,6 @@ static CMPIStatus MethodCleanup(
  58.170     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  58.171  
  58.172     /* Nothing needs to be done for cleanup. */
  58.173 -
  58.174 -exit:
  58.175     _SBLIM_RETURNSTATUS(status);
  58.176  }
  58.177  
  58.178 @@ -635,11 +632,11 @@ exit:
  58.179  // ----------------------------------------------------------------------------
  58.180  static CMPIStatus InvokeMethod(
  58.181                  CMPIMethodMI * self,            /* [in] Handle to this provider (i.e. 'self') */
  58.182 -                CMPIContext * context,          /* [in] Additional context info, if any */
  58.183 -                CMPIResult * results,           /* [out] Results of this operation */
  58.184 -                CMPIObjectPath * reference,     /* [in] Contains the CIM namespace, classname and desired object path */
  58.185 -                char * methodname,              /* [in] Name of the method to apply against the reference object */
  58.186 -                CMPIArgs * argsin,              /* [in] Method input arguments */
  58.187 +                const CMPIContext * context,          /* [in] Additional context info, if any */
  58.188 +                const CMPIResult * results,           /* [out] Results of this operation */
  58.189 +                const CMPIObjectPath * reference,     /* [in] Contains the CIM namespace, classname and desired object path */
  58.190 +                const char * methodname,              /* [in] Name of the method to apply against the reference object */
  58.191 +                const CMPIArgs * argsin,              /* [in] Method input arguments */
  58.192                  CMPIArgs * argsout)             /* [in] Method output arguments */
  58.193  {
  58.194     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
    59.1 --- a/src/Xen_OperatingSystem_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    59.2 +++ b/src/Xen_OperatingSystem_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    59.3 @@ -15,7 +15,7 @@
    59.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    59.5  // ============================================================================
    59.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    59.7 -// Contributors:
    59.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    59.9  // Description:
   59.10  // ============================================================================
   59.11  
   59.12 @@ -108,7 +108,7 @@ int Xen_OperatingSystem_getNextResource(
   59.13  // ----------------------------------------------------------------------------
   59.14  
   59.15  /* Get the specific resource that matches the CMPI object path. */
   59.16 -int Xen_OperatingSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   59.17 +int Xen_OperatingSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   59.18  {
   59.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   59.20  
   59.21 @@ -148,7 +148,7 @@ int Xen_OperatingSystem_freeResource( _R
   59.22  // ---------------------------------------------------------------------------- 
   59.23  
   59.24  /* Set the property values of a CMPI instance from a specific resource. */
   59.25 -int Xen_OperatingSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   59.26 +int Xen_OperatingSystem_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   59.27  {
   59.28     CMPIArray * status = CMNewArray(broker, 1, CMPI_uint16, NULL);
   59.29     int statusvalue;
   59.30 @@ -240,7 +240,7 @@ int Xen_OperatingSystem_deleteResource( 
   59.31  // ----------------------------------------------------------------------------
   59.32  
   59.33  /* Modify the specified resource using the property values of a CMPI instance. */
   59.34 -int Xen_OperatingSystem_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   59.35 +int Xen_OperatingSystem_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   59.36  {
   59.37     /* Unsupported. */
   59.38     return -1;
   59.39 @@ -249,7 +249,7 @@ int Xen_OperatingSystem_setResourceFromI
   59.40  // ----------------------------------------------------------------------------
   59.41  
   59.42  /* Create a new resource using the property values of a CMPI instance. */
   59.43 -int Xen_OperatingSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   59.44 +int Xen_OperatingSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   59.45  {
   59.46     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   59.47     CMPIData propertyvalue;
    60.1 --- a/src/Xen_OperatingSystem_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    60.2 +++ b/src/Xen_OperatingSystem_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    60.3 @@ -15,7 +15,7 @@
    60.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    60.5  // ============================================================================
    60.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    60.7 -// Contributors:
    60.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    60.9  // Description:
   60.10  // ============================================================================
   60.11  
   60.12 @@ -66,13 +66,13 @@ int Xen_OperatingSystem_freeResources( _
   60.13  int Xen_OperatingSystem_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   60.14  
   60.15  /* Get the specific resource that matches the CMPI object path. */
   60.16 -int Xen_OperatingSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   60.17 +int Xen_OperatingSystem_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   60.18  
   60.19  /* Free/deallocate/cleanup a resource after use. */
   60.20  int Xen_OperatingSystem_freeResource( _RESOURCE * resource );
   60.21  
   60.22  /* Set the property values of a CMPI instance from a specific resource. */
   60.23 -int Xen_OperatingSystem_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   60.24 +int Xen_OperatingSystem_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   60.25  
   60.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   60.27  
   60.28 @@ -80,8 +80,8 @@ int Xen_OperatingSystem_setInstanceFromR
   60.29  int Xen_OperatingSystem_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   60.30  
   60.31  /* Modify the specified resource using the property values of a CMPI instance. */
   60.32 -int Xen_OperatingSystem_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   60.33 +int Xen_OperatingSystem_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   60.34  
   60.35  /* Create a new resource using the property values of a CMPI instance. */
   60.36 -int Xen_OperatingSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   60.37 +int Xen_OperatingSystem_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   60.38  
    61.1 --- a/src/Xen_Processor.c	Fri Oct 20 13:20:15 2006 -0600
    61.2 +++ b/src/Xen_Processor.c	Tue Oct 24 11:30:03 2006 -0600
    61.3 @@ -16,7 +16,7 @@
    61.4  // ============================================================================
    61.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    61.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    61.7 -// Contributors:
    61.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    61.9  // Description:
   61.10  // ============================================================================
   61.11  
   61.12 @@ -31,7 +31,7 @@
   61.13  // ----------------------------------------------------------------------------
   61.14  
   61.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   61.16 -static CMPIBroker *_BROKER;
   61.17 +static const CMPIBroker *_BROKER;
   61.18  
   61.19  /* Include utility functions */
   61.20  #include "cmpiutil.h"
   61.21 @@ -65,7 +65,8 @@ const static char * _KEYNAMES[] = {"Syst
   61.22  // ----------------------------------------------------------------------------
   61.23  static CMPIStatus Cleanup(
   61.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   61.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   61.27 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   61.28  {
   61.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   61.30  
   61.31 @@ -74,8 +75,6 @@ static CMPIStatus Cleanup(
   61.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   61.33  
   61.34     /* Nothing needs to be done for cleanup. */
   61.35 -
   61.36 -exit:
   61.37     _SBLIM_RETURNSTATUS(status);
   61.38  }
   61.39  
   61.40 @@ -85,9 +84,9 @@ exit:
   61.41  // ----------------------------------------------------------------------------
   61.42  static CMPIStatus EnumInstanceNames(
   61.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   61.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   61.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   61.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   61.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   61.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   61.50  {
   61.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   61.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   61.53 @@ -165,9 +164,9 @@ exit:
   61.54  // ----------------------------------------------------------------------------
   61.55  static CMPIStatus EnumInstances(
   61.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   61.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   61.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   61.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   61.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   61.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   61.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   61.64  {
   61.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   61.66 @@ -246,9 +245,9 @@ exit:
   61.67  // ----------------------------------------------------------------------------
   61.68  static CMPIStatus GetInstance(
   61.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   61.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   61.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   61.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   61.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   61.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   61.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   61.77  {
   61.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   61.79 @@ -331,10 +330,11 @@ exit:
   61.80  // ----------------------------------------------------------------------------
   61.81  static CMPIStatus SetInstance(
   61.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   61.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   61.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   61.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   61.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   61.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   61.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   61.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   61.91 +      const char **properties)
   61.92  {
   61.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   61.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   61.95 @@ -403,10 +403,10 @@ exit:
   61.96  // ----------------------------------------------------------------------------
   61.97  static CMPIStatus CreateInstance(
   61.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   61.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  61.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  61.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  61.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  61.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  61.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  61.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  61.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  61.107  {
  61.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  61.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  61.110 @@ -482,9 +482,9 @@ exit:
  61.111  // ----------------------------------------------------------------------------
  61.112  static CMPIStatus DeleteInstance(
  61.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  61.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  61.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  61.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  61.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  61.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  61.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  61.120  {
  61.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  61.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  61.123 @@ -553,11 +553,11 @@ exit:
  61.124  // ----------------------------------------------------------------------------
  61.125  static CMPIStatus ExecQuery(
  61.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  61.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  61.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  61.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  61.130 -		char * language,		/* [in] Name of the query language. */
  61.131 -		char * query)			/* [in] Text of the query written in the query language. */
  61.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  61.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  61.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  61.135 +		const char * language,		/* [in] Name of the query language. */
  61.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  61.137  {
  61.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  61.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  61.140 @@ -586,15 +586,13 @@ exit:
  61.141  // ----------------------------------------------------------------------------
  61.142  static void Initialize(
  61.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  61.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  61.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  61.146  {
  61.147     _SBLIM_ENTER("Initialize");
  61.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  61.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  61.150  
  61.151     /* Nothing needs to be done to initialize this provider */
  61.152 -
  61.153 -exit:
  61.154     _SBLIM_RETURN();
  61.155  }
  61.156  
    62.1 --- a/src/Xen_ProcessorAllocatedFromPool.c	Fri Oct 20 13:20:15 2006 -0600
    62.2 +++ b/src/Xen_ProcessorAllocatedFromPool.c	Tue Oct 24 11:30:03 2006 -0600
    62.3 @@ -32,7 +32,7 @@
    62.4  // ----------------------------------------------------------------------------
    62.5  
    62.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    62.7 -static CMPIBroker *_BROKER;
    62.8 +static const CMPIBroker *_BROKER;
    62.9  
   62.10  /* Include utility functions */
   62.11  #include "cmpiutil.h"
   62.12 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Depend
   62.13  // ----------------------------------------------------------------------------
   62.14  static CMPIStatus AssociationCleanup(
   62.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   62.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   62.18 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   62.19  {
   62.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   62.21  
   62.22 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   62.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   62.24  
   62.25     /* Nothing needs to be done for cleanup. */
   62.26 -
   62.27 -exit:
   62.28     _SBLIM_RETURNSTATUS(status);
   62.29  }
   62.30  
   62.31 @@ -83,9 +82,9 @@ exit:
   62.32  // ----------------------------------------------------------------------------
   62.33  static CMPIStatus AssociatorNames(
   62.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   62.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   62.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   62.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   62.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   62.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   62.41  		const char * assocClass,
   62.42  		const char * resultClass,
   62.43  		const char * role,
   62.44 @@ -172,14 +171,14 @@ exit:
   62.45  // ----------------------------------------------------------------------------
   62.46  static CMPIStatus Associators(
   62.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   62.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   62.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   62.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   62.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   62.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   62.54  		const char *assocClass,
   62.55  		const char *resultClass,
   62.56  		const char *role,
   62.57  		const char *resultRole,
   62.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   62.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   62.60  {
   62.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   62.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   62.63 @@ -265,9 +264,9 @@ exit:
   62.64  // ----------------------------------------------------------------------------
   62.65  static CMPIStatus ReferenceNames(
   62.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   62.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   62.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   62.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   62.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   62.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   62.73  		const char *assocClass, 
   62.74  		const char *role)
   62.75  {
   62.76 @@ -363,12 +362,12 @@ exit:
   62.77  // ----------------------------------------------------------------------------
   62.78  static CMPIStatus References(
   62.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   62.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   62.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   62.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   62.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   62.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   62.86  		const char *assocClass,
   62.87  		const char *role,
   62.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   62.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   62.90  {
   62.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   62.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   62.93 @@ -464,15 +463,13 @@ exit:
   62.94  // ----------------------------------------------------------------------------
   62.95  static void AssociationInitialize(
   62.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   62.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   62.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   62.99  {
  62.100     _SBLIM_ENTER("AssociationInitialize");
  62.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  62.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  62.103  
  62.104     /* Nothing needs to be done to initialize this provider */
  62.105 -
  62.106 -exit:
  62.107     _SBLIM_RETURN();
  62.108  }
  62.109  
    63.1 --- a/src/Xen_ProcessorCapabilitiesSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    63.2 +++ b/src/Xen_ProcessorCapabilitiesSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    63.3 @@ -15,7 +15,7 @@
    63.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    63.5  // ============================================================================
    63.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    63.7 -// Contributors:
    63.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    63.9  // Description:
   63.10  // ============================================================================
   63.11  
   63.12 @@ -30,7 +30,7 @@
   63.13  // ----------------------------------------------------------------------------
   63.14  
   63.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   63.16 -static CMPIBroker *_BROKER;
   63.17 +static const CMPIBroker *_BROKER;
   63.18  
   63.19  /* Include utility functions */
   63.20  #include "cmpiutil.h"
   63.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   63.22  // ----------------------------------------------------------------------------
   63.23  static CMPIStatus Cleanup(
   63.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   63.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   63.27 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   63.28  {
   63.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   63.30  
   63.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   63.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   63.33  
   63.34     /* Nothing needs to be done for cleanup. */
   63.35 -
   63.36 -exit:
   63.37     _SBLIM_RETURNSTATUS(status);
   63.38  }
   63.39  
   63.40 @@ -84,9 +83,9 @@ exit:
   63.41  // ----------------------------------------------------------------------------
   63.42  static CMPIStatus EnumInstanceNames(
   63.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   63.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   63.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   63.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   63.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   63.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   63.50  {
   63.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   63.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   63.53 @@ -164,9 +163,9 @@ exit:
   63.54  // ----------------------------------------------------------------------------
   63.55  static CMPIStatus EnumInstances(
   63.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   63.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   63.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   63.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   63.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   63.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   63.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   63.64  {
   63.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   63.66 @@ -245,9 +244,9 @@ exit:
   63.67  // ----------------------------------------------------------------------------
   63.68  static CMPIStatus GetInstance(
   63.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   63.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   63.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   63.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   63.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   63.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   63.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   63.77  {
   63.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   63.79 @@ -330,10 +329,11 @@ exit:
   63.80  // ----------------------------------------------------------------------------
   63.81  static CMPIStatus SetInstance(
   63.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   63.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   63.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   63.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   63.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   63.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   63.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   63.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   63.91 +      const char **properties)
   63.92  {
   63.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   63.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   63.95 @@ -402,10 +402,10 @@ exit:
   63.96  // ----------------------------------------------------------------------------
   63.97  static CMPIStatus CreateInstance(
   63.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   63.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  63.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  63.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  63.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  63.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  63.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  63.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  63.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  63.107  {
  63.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  63.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  63.110 @@ -481,9 +481,9 @@ exit:
  63.111  // ----------------------------------------------------------------------------
  63.112  static CMPIStatus DeleteInstance(
  63.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  63.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  63.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  63.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  63.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  63.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  63.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  63.120  {
  63.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  63.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  63.123 @@ -552,11 +552,11 @@ exit:
  63.124  // ----------------------------------------------------------------------------
  63.125  static CMPIStatus ExecQuery(
  63.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  63.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  63.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  63.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  63.130 -		char * language,		/* [in] Name of the query language. */
  63.131 -		char * query)			/* [in] Text of the query written in the query language. */
  63.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  63.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  63.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  63.135 +		const char * language,		/* [in] Name of the query language. */
  63.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  63.137  {
  63.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  63.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  63.140 @@ -585,15 +585,13 @@ exit:
  63.141  // ----------------------------------------------------------------------------
  63.142  static void Initialize(
  63.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  63.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  63.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  63.146  {
  63.147     _SBLIM_ENTER("Initialize");
  63.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  63.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  63.150  
  63.151     /* Nothing needs to be done to initialize this provider */
  63.152 -
  63.153 -exit:
  63.154     _SBLIM_RETURN();
  63.155  }
  63.156  
    64.1 --- a/src/Xen_ProcessorCapabilitiesSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    64.2 +++ b/src/Xen_ProcessorCapabilitiesSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    64.3 @@ -15,11 +15,12 @@
    64.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    64.5  // ============================================================================
    64.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    64.7 -// Contributors:
    64.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    64.9  // Description:
   64.10  // ============================================================================
   64.11  
   64.12  #include <string.h>
   64.13 +#include <stdlib.h>
   64.14  
   64.15  #include "Xen_ProcessorCapabilitiesSettingData_Resource.h"
   64.16  
   64.17 @@ -113,7 +114,7 @@ int Xen_ProcessorCapabilitiesSettingData
   64.18  // ----------------------------------------------------------------------------
   64.19  
   64.20  /* Get the specific resource that matches the CMPI object path. */
   64.21 -int Xen_ProcessorCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   64.22 +int Xen_ProcessorCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   64.23  {
   64.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   64.25  
   64.26 @@ -183,7 +184,7 @@ int Xen_ProcessorCapabilitiesSettingData
   64.27  // ---------------------------------------------------------------------------- 
   64.28  
   64.29  /* Set the property values of a CMPI instance from a specific resource. */
   64.30 -int Xen_ProcessorCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   64.31 +int Xen_ProcessorCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   64.32  {
   64.33     if (resource == NULL) return 0;
   64.34     if (CMIsNullObject(instance)) return 0;
   64.35 @@ -220,7 +221,7 @@ int Xen_ProcessorCapabilitiesSettingData
   64.36  // ----------------------------------------------------------------------------
   64.37  
   64.38  /* Modify the specified resource using the property values of a CMPI instance. */
   64.39 -int Xen_ProcessorCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   64.40 +int Xen_ProcessorCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   64.41  {
   64.42     /* Unsupported. */
   64.43     return -1;
   64.44 @@ -229,7 +230,7 @@ int Xen_ProcessorCapabilitiesSettingData
   64.45  // ----------------------------------------------------------------------------
   64.46  
   64.47  /* Create a new resource using the property values of a CMPI instance. */
   64.48 -int Xen_ProcessorCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   64.49 +int Xen_ProcessorCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   64.50  {
   64.51     /* Unsupported. */
   64.52     return -1;
    65.1 --- a/src/Xen_ProcessorCapabilitiesSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    65.2 +++ b/src/Xen_ProcessorCapabilitiesSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    65.3 @@ -15,7 +15,7 @@
    65.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    65.5  // ============================================================================
    65.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    65.7 -// Contributors:
    65.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    65.9  // Description:
   65.10  // ============================================================================
   65.11  
   65.12 @@ -66,13 +66,13 @@ int Xen_ProcessorCapabilitiesSettingData
   65.13  int Xen_ProcessorCapabilitiesSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   65.14  
   65.15  /* Get the specific resource that matches the CMPI object path. */
   65.16 -int Xen_ProcessorCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   65.17 +int Xen_ProcessorCapabilitiesSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   65.18  
   65.19  /* Free/deallocate/cleanup a resource after use. */
   65.20  int Xen_ProcessorCapabilitiesSettingData_freeResource( _RESOURCE * resource );
   65.21  
   65.22  /* Set the property values of a CMPI instance from a specific resource. */
   65.23 -int Xen_ProcessorCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   65.24 +int Xen_ProcessorCapabilitiesSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   65.25  
   65.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   65.27  
   65.28 @@ -80,8 +80,8 @@ int Xen_ProcessorCapabilitiesSettingData
   65.29  int Xen_ProcessorCapabilitiesSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   65.30  
   65.31  /* Modify the specified resource using the property values of a CMPI instance. */
   65.32 -int Xen_ProcessorCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   65.33 +int Xen_ProcessorCapabilitiesSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   65.34  
   65.35  /* Create a new resource using the property values of a CMPI instance. */
   65.36 -int Xen_ProcessorCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   65.37 +int Xen_ProcessorCapabilitiesSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   65.38  
    66.1 --- a/src/Xen_ProcessorElementSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    66.2 +++ b/src/Xen_ProcessorElementSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    66.3 @@ -15,7 +15,7 @@
    66.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    66.5  // ============================================================================
    66.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    66.7 -// Contributors:
    66.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    66.9  // Description:
   66.10  // ============================================================================
   66.11  
   66.12 @@ -32,7 +32,7 @@
   66.13  // ----------------------------------------------------------------------------
   66.14  
   66.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   66.16 -static CMPIBroker *_BROKER;
   66.17 +static const CMPIBroker *_BROKER;
   66.18  
   66.19  /* Include utility functions */
   66.20  #include "cmpiutil.h"
   66.21 @@ -64,7 +64,8 @@ static char * _RHSKEYNAME = "SystemName"
   66.22  // ----------------------------------------------------------------------------
   66.23  static CMPIStatus AssociationCleanup(
   66.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   66.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   66.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   66.27 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   66.28  {
   66.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   66.30  
   66.31 @@ -73,8 +74,6 @@ static CMPIStatus AssociationCleanup(
   66.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   66.33  
   66.34     /* Nothing needs to be done for cleanup. */
   66.35 -
   66.36 -exit:
   66.37     _SBLIM_RETURNSTATUS(status);
   66.38  }
   66.39  
   66.40 @@ -84,9 +83,9 @@ exit:
   66.41  // ----------------------------------------------------------------------------
   66.42  static CMPIStatus AssociatorNames(
   66.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   66.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   66.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   66.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   66.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   66.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   66.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   66.50  		const char * assocClass,
   66.51  		const char * resultClass,
   66.52  		const char * role,
   66.53 @@ -185,14 +184,14 @@ exit:
   66.54  // ----------------------------------------------------------------------------
   66.55  static CMPIStatus Associators(
   66.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   66.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   66.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   66.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   66.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   66.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   66.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   66.63  		const char *assocClass,
   66.64  		const char *resultClass,
   66.65  		const char *role,
   66.66  		const char *resultRole,
   66.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   66.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   66.69  {
   66.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   66.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   66.72 @@ -290,9 +289,9 @@ exit:
   66.73  // ----------------------------------------------------------------------------
   66.74  static CMPIStatus ReferenceNames(
   66.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   66.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   66.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   66.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   66.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   66.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   66.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   66.82  		const char *assocClass, 
   66.83  		const char *role)
   66.84  {
   66.85 @@ -403,12 +402,12 @@ exit:
   66.86  // ----------------------------------------------------------------------------
   66.87  static CMPIStatus References(
   66.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   66.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   66.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   66.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   66.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   66.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   66.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   66.95  		const char *assocClass,
   66.96  		const char *role,
   66.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   66.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   66.99  {
  66.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  66.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  66.102 @@ -518,15 +517,13 @@ exit:
  66.103  // ----------------------------------------------------------------------------
  66.104  static void AssociationInitialize(
  66.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  66.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  66.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  66.108  {
  66.109     _SBLIM_ENTER("AssociationInitialize");
  66.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  66.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  66.112  
  66.113     /* Nothing needs to be done to initialize this provider */
  66.114 -
  66.115 -exit:
  66.116     _SBLIM_RETURN();
  66.117  }
  66.118  
    67.1 --- a/src/Xen_ProcessorPool.c	Fri Oct 20 13:20:15 2006 -0600
    67.2 +++ b/src/Xen_ProcessorPool.c	Tue Oct 24 11:30:03 2006 -0600
    67.3 @@ -32,7 +32,7 @@
    67.4  // ----------------------------------------------------------------------------
    67.5  
    67.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    67.7 -static CMPIBroker *_BROKER;
    67.8 +static const CMPIBroker *_BROKER;
    67.9  
   67.10  /* Include utility functions */
   67.11  #include "cmpiutil.h"
   67.12 @@ -66,7 +66,8 @@ const static char * _KEYNAMES[] = {"Inst
   67.13  // ----------------------------------------------------------------------------
   67.14  static CMPIStatus Cleanup(
   67.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   67.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.18 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   67.19  {
   67.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   67.21  
   67.22 @@ -75,8 +76,6 @@ static CMPIStatus Cleanup(
   67.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   67.24  
   67.25     /* Nothing needs to be done for cleanup. */
   67.26 -
   67.27 -exit:
   67.28     _SBLIM_RETURNSTATUS(status);
   67.29  }
   67.30  
   67.31 @@ -86,9 +85,9 @@ exit:
   67.32  // ----------------------------------------------------------------------------
   67.33  static CMPIStatus EnumInstanceNames(
   67.34  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   67.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   67.37 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   67.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   67.40 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   67.41  {
   67.42     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   67.43     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   67.44 @@ -171,9 +170,9 @@ exit:
   67.45  // ----------------------------------------------------------------------------
   67.46  static CMPIStatus EnumInstances(
   67.47  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   67.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   67.50 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   67.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   67.53 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   67.54  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   67.55  {
   67.56     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   67.57 @@ -257,9 +256,9 @@ exit:
   67.58  // ----------------------------------------------------------------------------
   67.59  static CMPIStatus GetInstance(
   67.60  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.61 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   67.62 -		CMPIResult * results,		/* [out] Results of this operation. */
   67.63 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.64 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.65 +		const CMPIResult * results,		/* [out] Results of this operation. */
   67.66 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.67  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   67.68  {
   67.69     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   67.70 @@ -347,10 +346,11 @@ exit:
   67.71  // ----------------------------------------------------------------------------
   67.72  static CMPIStatus SetInstance(
   67.73  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.74 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   67.75 -		CMPIResult * results,		/* [out] Results of this operation. */
   67.76 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.77 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   67.78 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.79 +		const CMPIResult * results,		/* [out] Results of this operation. */
   67.80 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.81 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   67.82 +      const char **properties)
   67.83  {
   67.84     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   67.85     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   67.86 @@ -424,10 +424,10 @@ exit:
   67.87  // ----------------------------------------------------------------------------
   67.88  static CMPIStatus CreateInstance(
   67.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   67.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   67.91 -		CMPIResult * results,		/* [out] Results of this operation. */
   67.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   67.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   67.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
   67.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   67.97 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   67.98  {
   67.99     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  67.100     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  67.101 @@ -508,9 +508,9 @@ exit:
  67.102  // ----------------------------------------------------------------------------
  67.103  static CMPIStatus DeleteInstance(
  67.104  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  67.105 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  67.106 -		CMPIResult * results,		/* [out] Results of this operation. */
  67.107 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  67.108 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  67.109 +		const CMPIResult * results,		/* [out] Results of this operation. */
  67.110 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  67.111  {
  67.112     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  67.113     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  67.114 @@ -584,11 +584,11 @@ exit:
  67.115  // ----------------------------------------------------------------------------
  67.116  static CMPIStatus ExecQuery(
  67.117  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  67.118 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  67.119 -		CMPIResult * results,		/* [out] Results of this operation. */
  67.120 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  67.121 -		char * language,		/* [in] Name of the query language. */
  67.122 -		char * query)			/* [in] Text of the query written in the query language. */
  67.123 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  67.124 +		const CMPIResult * results,		/* [out] Results of this operation. */
  67.125 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  67.126 +		const char * language,		/* [in] Name of the query language. */
  67.127 +		const char * query)			/* [in] Text of the query written in the query language. */
  67.128  {
  67.129     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  67.130     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  67.131 @@ -622,15 +622,13 @@ exit:
  67.132  // ----------------------------------------------------------------------------
  67.133  static void Initialize(
  67.134  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  67.135 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  67.136 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  67.137  {
  67.138     _SBLIM_ENTER("Initialize");
  67.139     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  67.140     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  67.141  
  67.142     /* Nothing needs to be done to initialize this provider */
  67.143 -
  67.144 -exit:
  67.145     _SBLIM_RETURN();
  67.146  }
  67.147  
    68.1 --- a/src/Xen_ProcessorPoolComponent.c	Fri Oct 20 13:20:15 2006 -0600
    68.2 +++ b/src/Xen_ProcessorPoolComponent.c	Tue Oct 24 11:30:03 2006 -0600
    68.3 @@ -32,7 +32,7 @@
    68.4  // ----------------------------------------------------------------------------
    68.5  
    68.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    68.7 -static CMPIBroker *_BROKER;
    68.8 +static const CMPIBroker *_BROKER;
    68.9  
   68.10  /* Include utility functions */
   68.11  #include "cmpiutil.h"
   68.12 @@ -67,7 +67,8 @@ static char * _XEN_DOMU_PROCESSOR_CLASS 
   68.13  // ----------------------------------------------------------------------------
   68.14  static CMPIStatus AssociationCleanup(
   68.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   68.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   68.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   68.18 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   68.19  {
   68.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   68.21  
   68.22 @@ -76,8 +77,6 @@ static CMPIStatus AssociationCleanup(
   68.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   68.24  
   68.25     /* Nothing needs to be done for cleanup. */
   68.26 -
   68.27 -exit:
   68.28     _SBLIM_RETURNSTATUS(status);
   68.29  }
   68.30  
   68.31 @@ -87,9 +86,9 @@ exit:
   68.32  // ----------------------------------------------------------------------------
   68.33  static CMPIStatus AssociatorNames(
   68.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   68.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   68.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   68.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   68.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   68.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   68.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   68.41  		const char * assocClass,
   68.42  		const char * resultClass,
   68.43  		const char * role,
   68.44 @@ -190,14 +189,14 @@ exit:
   68.45  // ----------------------------------------------------------------------------
   68.46  static CMPIStatus Associators(
   68.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   68.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   68.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   68.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   68.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   68.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   68.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   68.54  		const char *assocClass,
   68.55  		const char *resultClass,
   68.56  		const char *role,
   68.57  		const char *resultRole,
   68.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   68.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   68.60  {
   68.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   68.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   68.63 @@ -298,9 +297,9 @@ exit:
   68.64  // ----------------------------------------------------------------------------
   68.65  static CMPIStatus ReferenceNames(
   68.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   68.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   68.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   68.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   68.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   68.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   68.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   68.73  		const char *assocClass, 
   68.74  		const char *role)
   68.75  {
   68.76 @@ -345,7 +344,7 @@ static CMPIStatus ReferenceNames(
   68.77        targetclass = _RHSCLASSNAME;
   68.78        targetnamespace = _RHSNAMESPACE;
   68.79        /* Refences of LHS class should always be in LHS namespace. */
   68.80 -      CMSetNameSpace(reference, _LHSNAMESPACE);
   68.81 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
   68.82     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
   68.83        targetclass = _LHSCLASSNAME;
   68.84        targetnamespace = _LHSNAMESPACE;
   68.85 @@ -411,12 +410,12 @@ exit:
   68.86  // ----------------------------------------------------------------------------
   68.87  static CMPIStatus References(
   68.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   68.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   68.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   68.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   68.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   68.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   68.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   68.95  		const char *assocClass,
   68.96  		const char *role,
   68.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   68.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   68.99  {
  68.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  68.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  68.102 @@ -459,7 +458,7 @@ static CMPIStatus References(
  68.103        targetclass = _RHSCLASSNAME;
  68.104        targetnamespace = _RHSNAMESPACE;
  68.105        /* Refences of LHS class should always be in LHS namespace. */
  68.106 -      CMSetNameSpace(reference, _LHSNAMESPACE);
  68.107 +      CMSetNameSpace((CMPIObjectPath *)reference, _LHSNAMESPACE);
  68.108     } else if (CMClassPathIsA(_BROKER, reference, _RHSCLASSNAME, NULL)) {
  68.109        targetclass = _LHSCLASSNAME;
  68.110        targetnamespace = _LHSNAMESPACE;
  68.111 @@ -526,15 +525,13 @@ exit:
  68.112  // ----------------------------------------------------------------------------
  68.113  static void AssociationInitialize(
  68.114  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  68.115 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  68.116 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  68.117  {
  68.118     _SBLIM_ENTER("AssociationInitialize");
  68.119     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  68.120     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  68.121  
  68.122     /* Nothing needs to be done to initialize this provider */
  68.123 -
  68.124 -exit:
  68.125     _SBLIM_RETURN();
  68.126  }
  68.127  
    69.1 --- a/src/Xen_ProcessorPool_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    69.2 +++ b/src/Xen_ProcessorPool_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    69.3 @@ -15,8 +15,7 @@
    69.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    69.5  // ============================================================================
    69.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    69.7 -//                Jim Fehlig, <jfehlig@novell.com>
    69.8 -// Contributors:
    69.9 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
   69.10  // Description:
   69.11  // ============================================================================
   69.12  
   69.13 @@ -41,7 +40,7 @@ static char * _RESOURCECLASSNAME = "CIM_
   69.14  
   69.15  // ----------------------------------------------------------------------------
   69.16  
   69.17 -static int populate_resource( _RESOURCE * resource, CMPIBroker * broker, CMPIContext * context )
   69.18 +static int populate_resource( _RESOURCE * resource, const CMPIBroker * broker, const CMPIContext * context )
   69.19  {
   69.20     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   69.21     /* Get the number of host processors from the SMASH host instrumentation. */
   69.22 @@ -99,7 +98,7 @@ int Xen_ProcessorPool_freeResources( _RE
   69.23  // ----------------------------------------------------------------------------
   69.24  
   69.25  /* Iterator to get the next resource from the resources list. */
   69.26 -int Xen_ProcessorPool_getNextResource( _RESOURCES * resources, _RESOURCE ** resource, CMPIBroker * broker, CMPIContext * context )
   69.27 +int Xen_ProcessorPool_getNextResource( _RESOURCES * resources, _RESOURCE ** resource, const CMPIBroker * broker, const CMPIContext * context )
   69.28  {
   69.29     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   69.30     if (resources == NULL) return 0;
   69.31 @@ -124,7 +123,7 @@ int Xen_ProcessorPool_getNextResource( _
   69.32  // ----------------------------------------------------------------------------
   69.33  
   69.34  /* Get the specific resource that matches the CMPI object path. */
   69.35 -int Xen_ProcessorPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath, CMPIBroker * broker, CMPIContext * context )
   69.36 +int Xen_ProcessorPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath, const CMPIBroker * broker, const CMPIContext * context )
   69.37  {
   69.38     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   69.39  
   69.40 @@ -171,7 +170,7 @@ int Xen_ProcessorPool_freeResource( _RES
   69.41  // ---------------------------------------------------------------------------- 
   69.42  
   69.43  /* Set the property values of a CMPI instance from a specific resource. */
   69.44 -int Xen_ProcessorPool_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   69.45 +int Xen_ProcessorPool_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   69.46  {
   69.47     if (resource == NULL) return 0;
   69.48     if (CMIsNullObject(instance)) return 0;
   69.49 @@ -202,7 +201,7 @@ int Xen_ProcessorPool_deleteResource( _R
   69.50  // ----------------------------------------------------------------------------
   69.51  
   69.52  /* Modify the specified resource using the property values of a CMPI instance. */
   69.53 -int Xen_ProcessorPool_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   69.54 +int Xen_ProcessorPool_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   69.55  {
   69.56     /* Unsupported. */
   69.57     return -1;
   69.58 @@ -211,7 +210,7 @@ int Xen_ProcessorPool_setResourceFromIns
   69.59  // ----------------------------------------------------------------------------
   69.60  
   69.61  /* Create a new resource using the property values of a CMPI instance. */
   69.62 -int Xen_ProcessorPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   69.63 +int Xen_ProcessorPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   69.64  {
   69.65     /* Unsupported. */
   69.66     return -1;
    70.1 --- a/src/Xen_ProcessorPool_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    70.2 +++ b/src/Xen_ProcessorPool_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    70.3 @@ -15,7 +15,7 @@
    70.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    70.5  // ============================================================================
    70.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    70.7 -// Contributors:
    70.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    70.9  // Description:
   70.10  // ============================================================================
   70.11  
   70.12 @@ -63,16 +63,16 @@ int Xen_ProcessorPool_getResources( _RES
   70.13  int Xen_ProcessorPool_freeResources( _RESOURCES * resources );
   70.14  
   70.15  /* Iterator to get the next resource from the resources list. */
   70.16 -int Xen_ProcessorPool_getNextResource( _RESOURCES * resources, _RESOURCE ** resource, CMPIBroker * broker, CMPIContext * context );
   70.17 +int Xen_ProcessorPool_getNextResource( _RESOURCES * resources, _RESOURCE ** resource, const CMPIBroker * broker, const CMPIContext * context );
   70.18  
   70.19  /* Get the specific resource that matches the CMPI object path. */
   70.20 -int Xen_ProcessorPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath, CMPIBroker * broker, CMPIContext * context );
   70.21 +int Xen_ProcessorPool_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath, const CMPIBroker * broker, const CMPIContext * context );
   70.22  
   70.23  /* Free/deallocate/cleanup a resource after use. */
   70.24  int Xen_ProcessorPool_freeResource( _RESOURCE * resource );
   70.25  
   70.26  /* Set the property values of a CMPI instance from a specific resource. */
   70.27 -int Xen_ProcessorPool_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   70.28 +int Xen_ProcessorPool_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   70.29  
   70.30  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   70.31  
   70.32 @@ -80,8 +80,8 @@ int Xen_ProcessorPool_setInstanceFromRes
   70.33  int Xen_ProcessorPool_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   70.34  
   70.35  /* Modify the specified resource using the property values of a CMPI instance. */
   70.36 -int Xen_ProcessorPool_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   70.37 +int Xen_ProcessorPool_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   70.38  
   70.39  /* Create a new resource using the property values of a CMPI instance. */
   70.40 -int Xen_ProcessorPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   70.41 +int Xen_ProcessorPool_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   70.42  
    71.1 --- a/src/Xen_ProcessorSettingAllocationFromPool.c	Fri Oct 20 13:20:15 2006 -0600
    71.2 +++ b/src/Xen_ProcessorSettingAllocationFromPool.c	Tue Oct 24 11:30:03 2006 -0600
    71.3 @@ -32,7 +32,7 @@
    71.4  // ----------------------------------------------------------------------------
    71.5  
    71.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    71.7 -static CMPIBroker *_BROKER;
    71.8 +static const CMPIBroker *_BROKER;
    71.9  
   71.10  /* Include utility functions */
   71.11  #include "cmpiutil.h"
   71.12 @@ -63,7 +63,8 @@ static char * _RHSPROPERTYNAME = "Depend
   71.13  // ----------------------------------------------------------------------------
   71.14  static CMPIStatus AssociationCleanup(
   71.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   71.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   71.18 +      CMPIBoolean terminating)   /* [in] True if MB is terminating */
   71.19  {
   71.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   71.21  
   71.22 @@ -72,8 +73,6 @@ static CMPIStatus AssociationCleanup(
   71.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   71.24  
   71.25     /* Nothing needs to be done for cleanup. */
   71.26 -
   71.27 -exit:
   71.28     _SBLIM_RETURNSTATUS(status);
   71.29  }
   71.30  
   71.31 @@ -83,9 +82,9 @@ exit:
   71.32  // ----------------------------------------------------------------------------
   71.33  static CMPIStatus AssociatorNames(
   71.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   71.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   71.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   71.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   71.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   71.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   71.41  		const char * assocClass,
   71.42  		const char * resultClass,
   71.43  		const char * role,
   71.44 @@ -171,14 +170,14 @@ exit:
   71.45  // ----------------------------------------------------------------------------
   71.46  static CMPIStatus Associators(
   71.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   71.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   71.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   71.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   71.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   71.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   71.54  		const char *assocClass,
   71.55  		const char *resultClass,
   71.56  		const char *role,
   71.57  		const char *resultRole,
   71.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   71.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   71.60  {
   71.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   71.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   71.63 @@ -263,9 +262,9 @@ exit:
   71.64  // ----------------------------------------------------------------------------
   71.65  static CMPIStatus ReferenceNames(
   71.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   71.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   71.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   71.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   71.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   71.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   71.73  		const char *assocClass, 
   71.74  		const char *role)
   71.75  {
   71.76 @@ -361,12 +360,12 @@ exit:
   71.77  // ----------------------------------------------------------------------------
   71.78  static CMPIStatus References(
   71.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   71.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   71.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   71.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   71.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   71.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   71.86  		const char *assocClass,
   71.87  		const char *role,
   71.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   71.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   71.90  {
   71.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   71.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   71.93 @@ -462,15 +461,13 @@ exit:
   71.94  // ----------------------------------------------------------------------------
   71.95  static void AssociationInitialize(
   71.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   71.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   71.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   71.99  {
  71.100     _SBLIM_ENTER("AssociationInitialize");
  71.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  71.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  71.103  
  71.104     /* Nothing needs to be done to initialize this provider */
  71.105 -
  71.106 -exit:
  71.107     _SBLIM_RETURN();
  71.108  }
  71.109  
    72.1 --- a/src/Xen_ProcessorSettingData.c	Fri Oct 20 13:20:15 2006 -0600
    72.2 +++ b/src/Xen_ProcessorSettingData.c	Tue Oct 24 11:30:03 2006 -0600
    72.3 @@ -15,7 +15,7 @@
    72.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    72.5  // ============================================================================
    72.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    72.7 -// Contributors:
    72.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    72.9  // Description:
   72.10  // ============================================================================
   72.11  
   72.12 @@ -30,7 +30,7 @@
   72.13  // ----------------------------------------------------------------------------
   72.14  
   72.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   72.16 -static CMPIBroker *_BROKER;
   72.17 +static const CMPIBroker *_BROKER;
   72.18  
   72.19  /* Include utility functions */
   72.20  #include "cmpiutil.h"
   72.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   72.22  // ----------------------------------------------------------------------------
   72.23  static CMPIStatus Cleanup(
   72.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   72.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   72.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   72.28  {
   72.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   72.30  
   72.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   72.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   72.33  
   72.34     /* Nothing needs to be done for cleanup. */
   72.35 -
   72.36 -exit:
   72.37     _SBLIM_RETURNSTATUS(status);
   72.38  }
   72.39  
   72.40 @@ -84,9 +83,9 @@ exit:
   72.41  // ----------------------------------------------------------------------------
   72.42  static CMPIStatus EnumInstanceNames(
   72.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   72.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   72.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   72.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   72.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   72.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   72.50  {
   72.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   72.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   72.53 @@ -164,9 +163,9 @@ exit:
   72.54  // ----------------------------------------------------------------------------
   72.55  static CMPIStatus EnumInstances(
   72.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   72.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   72.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   72.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   72.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   72.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   72.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   72.64  {
   72.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   72.66 @@ -245,9 +244,9 @@ exit:
   72.67  // ----------------------------------------------------------------------------
   72.68  static CMPIStatus GetInstance(
   72.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   72.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   72.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   72.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   72.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   72.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   72.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   72.77  {
   72.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   72.79 @@ -330,10 +329,11 @@ exit:
   72.80  // ----------------------------------------------------------------------------
   72.81  static CMPIStatus SetInstance(
   72.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   72.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   72.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   72.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   72.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   72.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   72.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   72.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   72.91 +        const char **properties)
   72.92  {
   72.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   72.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   72.95 @@ -402,10 +402,10 @@ exit:
   72.96  // ----------------------------------------------------------------------------
   72.97  static CMPIStatus CreateInstance(
   72.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   72.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  72.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  72.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  72.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  72.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  72.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  72.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  72.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  72.107  {
  72.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  72.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  72.110 @@ -481,9 +481,9 @@ exit:
  72.111  // ----------------------------------------------------------------------------
  72.112  static CMPIStatus DeleteInstance(
  72.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  72.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  72.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  72.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  72.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  72.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  72.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  72.120  {
  72.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  72.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  72.123 @@ -552,11 +552,11 @@ exit:
  72.124  // ----------------------------------------------------------------------------
  72.125  static CMPIStatus ExecQuery(
  72.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  72.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  72.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  72.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  72.130 -		char * language,		/* [in] Name of the query language. */
  72.131 -		char * query)			/* [in] Text of the query written in the query language. */
  72.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  72.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  72.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  72.135 +		const char * language,		/* [in] Name of the query language. */
  72.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  72.137  {
  72.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  72.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  72.140 @@ -585,15 +585,13 @@ exit:
  72.141  // ----------------------------------------------------------------------------
  72.142  static void Initialize(
  72.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  72.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  72.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  72.146  {
  72.147     _SBLIM_ENTER("Initialize");
  72.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  72.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  72.150  
  72.151     /* Nothing needs to be done to initialize this provider */
  72.152 -
  72.153 -exit:
  72.154     _SBLIM_RETURN();
  72.155  }
  72.156  
    73.1 --- a/src/Xen_ProcessorSettingData_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    73.2 +++ b/src/Xen_ProcessorSettingData_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    73.3 @@ -15,7 +15,7 @@
    73.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    73.5  // ============================================================================
    73.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    73.7 -// Contributors:
    73.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    73.9  // Description:
   73.10  // ============================================================================
   73.11  
   73.12 @@ -108,7 +108,7 @@ int Xen_ProcessorSettingData_getNextReso
   73.13  // ----------------------------------------------------------------------------
   73.14  
   73.15  /* Get the specific resource that matches the CMPI object path. */
   73.16 -int Xen_ProcessorSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   73.17 +int Xen_ProcessorSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   73.18  {
   73.19     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   73.20  
   73.21 @@ -148,7 +148,7 @@ int Xen_ProcessorSettingData_freeResourc
   73.22  // ---------------------------------------------------------------------------- 
   73.23  
   73.24  /* Set the property values of a CMPI instance from a specific resource. */
   73.25 -int Xen_ProcessorSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   73.26 +int Xen_ProcessorSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   73.27  {
   73.28     int i;
   73.29     int instIdLen;
   73.30 @@ -206,7 +206,7 @@ int Xen_ProcessorSettingData_deleteResou
   73.31  // ----------------------------------------------------------------------------
   73.32  
   73.33  /* Modify the specified resource using the property values of a CMPI instance. */
   73.34 -int Xen_ProcessorSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   73.35 +int Xen_ProcessorSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   73.36  {
   73.37     /* Unsupported. */
   73.38     return -1;
   73.39 @@ -215,7 +215,7 @@ int Xen_ProcessorSettingData_setResource
   73.40  // ----------------------------------------------------------------------------
   73.41  
   73.42  /* Create a new resource using the property values of a CMPI instance. */
   73.43 -int Xen_ProcessorSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   73.44 +int Xen_ProcessorSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   73.45  {
   73.46     /* Unsupported. */
   73.47     return -1;
    74.1 --- a/src/Xen_ProcessorSettingData_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    74.2 +++ b/src/Xen_ProcessorSettingData_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    74.3 @@ -15,7 +15,7 @@
    74.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    74.5  // ============================================================================
    74.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    74.7 -// Contributors:
    74.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    74.9  // Description:
   74.10  // ============================================================================
   74.11  
   74.12 @@ -66,13 +66,13 @@ int Xen_ProcessorSettingData_freeResourc
   74.13  int Xen_ProcessorSettingData_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   74.14  
   74.15  /* Get the specific resource that matches the CMPI object path. */
   74.16 -int Xen_ProcessorSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   74.17 +int Xen_ProcessorSettingData_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   74.18  
   74.19  /* Free/deallocate/cleanup a resource after use. */
   74.20  int Xen_ProcessorSettingData_freeResource( _RESOURCE * resource );
   74.21  
   74.22  /* Set the property values of a CMPI instance from a specific resource. */
   74.23 -int Xen_ProcessorSettingData_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   74.24 +int Xen_ProcessorSettingData_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   74.25  
   74.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   74.27  
   74.28 @@ -80,8 +80,8 @@ int Xen_ProcessorSettingData_setInstance
   74.29  int Xen_ProcessorSettingData_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   74.30  
   74.31  /* Modify the specified resource using the property values of a CMPI instance. */
   74.32 -int Xen_ProcessorSettingData_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   74.33 +int Xen_ProcessorSettingData_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   74.34  
   74.35  /* Create a new resource using the property values of a CMPI instance. */
   74.36 -int Xen_ProcessorSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   74.37 +int Xen_ProcessorSettingData_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   74.38  
    75.1 --- a/src/Xen_Processor_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    75.2 +++ b/src/Xen_Processor_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    75.3 @@ -16,10 +16,12 @@
    75.4  // ============================================================================
    75.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    75.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    75.7 -// Contributors:
    75.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    75.9  // Description:
   75.10  // ============================================================================
   75.11  
   75.12 +#include <stdlib.h>
   75.13 +
   75.14  #include "Xen_Processor_Resource.h"
   75.15  
   75.16  /* Include the required CMPI data types, function headers, and macros. */
   75.17 @@ -109,7 +111,7 @@ int Xen_Processor_getNextResource( _RESO
   75.18  // ----------------------------------------------------------------------------
   75.19  
   75.20  /* Get the specific resource that matches the CMPI object path. */
   75.21 -int Xen_Processor_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   75.22 +int Xen_Processor_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   75.23  {
   75.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   75.25  
   75.26 @@ -150,7 +152,7 @@ int Xen_Processor_freeResource( _RESOURC
   75.27  // ---------------------------------------------------------------------------- 
   75.28  
   75.29  /* Set the property values of a CMPI instance from a specific resource. */
   75.30 -int Xen_Processor_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   75.31 +int Xen_Processor_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   75.32  {
   75.33     if (resource == NULL) return 0;
   75.34     if (CMIsNullObject(instance)) return 0;
   75.35 @@ -190,7 +192,7 @@ int Xen_Processor_deleteResource( _RESOU
   75.36  // ----------------------------------------------------------------------------
   75.37  
   75.38  /* Modify the specified resource using the property values of a CMPI instance. */
   75.39 -int Xen_Processor_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   75.40 +int Xen_Processor_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   75.41  {
   75.42     /* Unsupported. */
   75.43     return -1;
   75.44 @@ -199,7 +201,7 @@ int Xen_Processor_setResourceFromInstanc
   75.45  // ----------------------------------------------------------------------------
   75.46  
   75.47  /* Create a new resource using the property values of a CMPI instance. */
   75.48 -int Xen_Processor_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   75.49 +int Xen_Processor_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   75.50  {
   75.51     /* Unsupported. */
   75.52     return -1;
    76.1 --- a/src/Xen_Processor_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    76.2 +++ b/src/Xen_Processor_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    76.3 @@ -16,7 +16,7 @@
    76.4  // ============================================================================
    76.5  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    76.6  //                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
    76.7 -// Contributors:
    76.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    76.9  // Description:
   76.10  // ============================================================================
   76.11  
   76.12 @@ -68,13 +68,13 @@ int Xen_Processor_freeResources( _RESOUR
   76.13  int Xen_Processor_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   76.14  
   76.15  /* Get the specific resource that matches the CMPI object path. */
   76.16 -int Xen_Processor_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   76.17 +int Xen_Processor_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   76.18  
   76.19  /* Free/deallocate/cleanup a resource after use. */
   76.20  int Xen_Processor_freeResource( _RESOURCE * resource );
   76.21  
   76.22  /* Set the property values of a CMPI instance from a specific resource. */
   76.23 -int Xen_Processor_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   76.24 +int Xen_Processor_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   76.25  
   76.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   76.27  
   76.28 @@ -82,8 +82,8 @@ int Xen_Processor_setInstanceFromResourc
   76.29  int Xen_Processor_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   76.30  
   76.31  /* Modify the specified resource using the property values of a CMPI instance. */
   76.32 -int Xen_Processor_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   76.33 +int Xen_Processor_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   76.34  
   76.35  /* Create a new resource using the property values of a CMPI instance. */
   76.36 -int Xen_Processor_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   76.37 +int Xen_Processor_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   76.38  
    77.1 --- a/src/Xen_RegisteredProfiles.c	Fri Oct 20 13:20:15 2006 -0600
    77.2 +++ b/src/Xen_RegisteredProfiles.c	Tue Oct 24 11:30:03 2006 -0600
    77.3 @@ -1,4 +1,4 @@
    77.4 -// Copyright (C) 2006 IBM Corporation
    77.5 +// Copyright (C) 2006 Novell, Inc.
    77.6  //
    77.7  //    This library is free software; you can redistribute it and/or
    77.8  //    modify it under the terms of the GNU Lesser General Public
    77.9 @@ -14,8 +14,7 @@
   77.10  //    License along with this library; if not, write to the Free Software
   77.11  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   77.12  // ============================================================================
   77.13 -// Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
   77.14 -//                Tokunbo Adeshiyan, <tokunbo@us.ibm.com>
   77.15 +// Authors:       Jim Fehlig, <jfehlig@novell.com>
   77.16  // Contributors:
   77.17  // Description:
   77.18  // ============================================================================
   77.19 @@ -34,7 +33,7 @@
   77.20  // ----------------------------------------------------------------------------
   77.21  
   77.22  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   77.23 -static CMPIBroker *_BROKER;
   77.24 +static const CMPIBroker *_BROKER;
   77.25  
   77.26  /* Include utility functions */
   77.27  #include "cmpiutil.h"
   77.28 @@ -149,7 +148,8 @@ static int generateInstance(const char *
   77.29  // ----------------------------------------------------------------------------
   77.30  static CMPIStatus Cleanup(
   77.31  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   77.32 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   77.33 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   77.34 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   77.35  {
   77.36     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   77.37  
   77.38 @@ -158,8 +158,6 @@ static CMPIStatus Cleanup(
   77.39     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   77.40  
   77.41     /* Nothing needs to be done for cleanup. */
   77.42 -
   77.43 -exit:
   77.44     _SBLIM_RETURNSTATUS(status);
   77.45  }
   77.46  
   77.47 @@ -169,9 +167,9 @@ exit:
   77.48  // ----------------------------------------------------------------------------
   77.49  static CMPIStatus EnumInstanceNames(
   77.50  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   77.51 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   77.52 -		CMPIResult * results,		/* [out] Results of this operation. */
   77.53 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   77.54 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   77.55 +		const CMPIResult * results,		/* [out] Results of this operation. */
   77.56 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   77.57  {
   77.58     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   77.59     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   77.60 @@ -209,9 +207,9 @@ exit:
   77.61  // ----------------------------------------------------------------------------
   77.62  static CMPIStatus EnumInstances(
   77.63  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   77.64 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   77.65 -		CMPIResult * results,		/* [out] Results of this operation. */
   77.66 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   77.67 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   77.68 +		const CMPIResult * results,		/* [out] Results of this operation. */
   77.69 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   77.70  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   77.71  {
   77.72     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   77.73 @@ -248,9 +246,9 @@ static CMPIStatus EnumInstances(
   77.74  // ----------------------------------------------------------------------------
   77.75  static CMPIStatus GetInstance(
   77.76  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   77.77 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   77.78 -		CMPIResult * results,		/* [out] Results of this operation. */
   77.79 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   77.80 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   77.81 +		const CMPIResult * results,		/* [out] Results of this operation. */
   77.82 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   77.83  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   77.84  {
   77.85     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   77.86 @@ -303,10 +301,11 @@ exit:
   77.87  // ----------------------------------------------------------------------------
   77.88  static CMPIStatus SetInstance(
   77.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   77.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   77.91 -		CMPIResult * results,		/* [out] Results of this operation. */
   77.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   77.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   77.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   77.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
   77.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   77.97 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   77.98 +        const char **properties)
   77.99  {
  77.100     CMPIStatus status;	/* Return status of CIM operations. */
  77.101     
  77.102 @@ -322,10 +321,10 @@ static CMPIStatus SetInstance(
  77.103  // ----------------------------------------------------------------------------
  77.104  static CMPIStatus CreateInstance(
  77.105  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  77.106 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  77.107 -		CMPIResult * results,		/* [out] Results of this operation. */
  77.108 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  77.109 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  77.110 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  77.111 +		const CMPIResult * results,		/* [out] Results of this operation. */
  77.112 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  77.113 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  77.114  {
  77.115     CMPIStatus status;	/* Return status of CIM operations. */
  77.116     
  77.117 @@ -341,9 +340,9 @@ static CMPIStatus CreateInstance(
  77.118  // ----------------------------------------------------------------------------
  77.119  static CMPIStatus DeleteInstance(
  77.120  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  77.121 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  77.122 -		CMPIResult * results,		/* [out] Results of this operation. */
  77.123 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  77.124 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  77.125 +		const CMPIResult * results,		/* [out] Results of this operation. */
  77.126 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  77.127  {
  77.128     CMPIStatus status;	/* Return status of CIM operations. */
  77.129     
  77.130 @@ -360,11 +359,11 @@ static CMPIStatus DeleteInstance(
  77.131  // ----------------------------------------------------------------------------
  77.132  static CMPIStatus ExecQuery(
  77.133  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  77.134 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  77.135 -		CMPIResult * results,		/* [out] Results of this operation. */
  77.136 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  77.137 -		char * language,		/* [in] Name of the query language. */
  77.138 -		char * query)			/* [in] Text of the query written in the query language. */
  77.139 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  77.140 +		const CMPIResult * results,		/* [out] Results of this operation. */
  77.141 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  77.142 +		const char * language,		/* [in] Name of the query language. */
  77.143 +		const char * query)			/* [in] Text of the query written in the query language. */
  77.144  {
  77.145     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  77.146     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  77.147 @@ -393,7 +392,7 @@ exit:
  77.148  // ----------------------------------------------------------------------------
  77.149  static void Initialize(
  77.150  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  77.151 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  77.152 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  77.153  {
  77.154     CMPIString *temp;
  77.155     
  77.156 @@ -402,8 +401,6 @@ static void Initialize(
  77.157     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  77.158  
  77.159     /* Nothing needs to be done to initialize this provider */
  77.160 -
  77.161 -exit:
  77.162     _SBLIM_RETURN();
  77.163  }
  77.164  
    78.1 --- a/src/Xen_RunningOS.c	Fri Oct 20 13:20:15 2006 -0600
    78.2 +++ b/src/Xen_RunningOS.c	Tue Oct 24 11:30:03 2006 -0600
    78.3 @@ -15,7 +15,7 @@
    78.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    78.5  // ============================================================================
    78.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    78.7 -// Contributors:
    78.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    78.9  // Description:
   78.10  // ============================================================================
   78.11  
   78.12 @@ -32,7 +32,7 @@
   78.13  // ----------------------------------------------------------------------------
   78.14  
   78.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   78.16 -static CMPIBroker *_BROKER;
   78.17 +static const CMPIBroker *_BROKER;
   78.18  
   78.19  /* Include utility functions */
   78.20  #include "cmpiutil.h"
   78.21 @@ -68,7 +68,8 @@ static char * _RHSKEYNAME = "CSName";
   78.22  // ----------------------------------------------------------------------------
   78.23  static CMPIStatus AssociationCleanup(
   78.24  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   78.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   78.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   78.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   78.28  {
   78.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   78.30  
   78.31 @@ -77,8 +78,6 @@ static CMPIStatus AssociationCleanup(
   78.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   78.33  
   78.34     /* Nothing needs to be done for cleanup. */
   78.35 -
   78.36 -exit:
   78.37     _SBLIM_RETURNSTATUS(status);
   78.38  }
   78.39  
   78.40 @@ -88,9 +87,9 @@ exit:
   78.41  // ----------------------------------------------------------------------------
   78.42  static CMPIStatus AssociatorNames(
   78.43  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   78.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   78.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   78.46 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   78.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   78.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   78.49 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   78.50  		const char * assocClass,
   78.51  		const char * resultClass,
   78.52  		const char * role,
   78.53 @@ -189,14 +188,14 @@ exit:
   78.54  // ----------------------------------------------------------------------------
   78.55  static CMPIStatus Associators(
   78.56  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   78.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   78.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   78.59 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   78.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   78.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   78.62 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   78.63  		const char *assocClass,
   78.64  		const char *resultClass,
   78.65  		const char *role,
   78.66  		const char *resultRole,
   78.67 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   78.68 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   78.69  {
   78.70     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   78.71     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   78.72 @@ -294,9 +293,9 @@ exit:
   78.73  // ----------------------------------------------------------------------------
   78.74  static CMPIStatus ReferenceNames(
   78.75  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   78.76 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   78.77 -		CMPIResult * results,		/* [out] Results of this operation. */
   78.78 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   78.79 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   78.80 +		const CMPIResult * results,		/* [out] Results of this operation. */
   78.81 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   78.82  		const char *assocClass, 
   78.83  		const char *role)
   78.84  {
   78.85 @@ -407,12 +406,12 @@ exit:
   78.86  // ----------------------------------------------------------------------------
   78.87  static CMPIStatus References(
   78.88  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   78.89 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   78.90 -		CMPIResult * results,		/* [out] Results of this operation. */
   78.91 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   78.92 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   78.93 +		const CMPIResult * results,		/* [out] Results of this operation. */
   78.94 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   78.95  		const char *assocClass,
   78.96  		const char *role,
   78.97 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   78.98 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   78.99  {
  78.100     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
  78.101     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  78.102 @@ -522,15 +521,13 @@ exit:
  78.103  // ----------------------------------------------------------------------------
  78.104  static void AssociationInitialize(
  78.105  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
  78.106 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  78.107 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  78.108  {
  78.109     _SBLIM_ENTER("AssociationInitialize");
  78.110     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  78.111     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  78.112  
  78.113     /* Nothing needs to be done to initialize this provider */
  78.114 -
  78.115 -exit:
  78.116     _SBLIM_RETURN();
  78.117  }
  78.118  
    79.1 --- a/src/Xen_VSMSElementCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
    79.2 +++ b/src/Xen_VSMSElementCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
    79.3 @@ -32,7 +32,7 @@
    79.4  // ----------------------------------------------------------------------------
    79.5  
    79.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    79.7 -static CMPIBroker *_BROKER;
    79.8 +static const CMPIBroker *_BROKER;
    79.9  
   79.10  /* Include utility functions */
   79.11  #include "cmpiutil.h"
   79.12 @@ -65,7 +65,8 @@ static char * _RHSNAMESPACE = "root/cimv
   79.13  // ----------------------------------------------------------------------------
   79.14  static CMPIStatus AssociationCleanup(
   79.15  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   79.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   79.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   79.19  {
   79.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   79.21  
   79.22 @@ -74,8 +75,6 @@ static CMPIStatus AssociationCleanup(
   79.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   79.24  
   79.25     /* Nothing needs to be done for cleanup. */
   79.26 -
   79.27 -exit:
   79.28     _SBLIM_RETURNSTATUS(status);
   79.29  }
   79.30  
   79.31 @@ -85,9 +84,9 @@ exit:
   79.32  // ----------------------------------------------------------------------------
   79.33  static CMPIStatus AssociatorNames(
   79.34  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   79.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   79.37 -		CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   79.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   79.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   79.40 +		const CMPIObjectPath * reference,	/* [in] Contains source namespace, classname and object path. */
   79.41  		const char * assocClass,
   79.42  		const char * resultClass,
   79.43  		const char * role,
   79.44 @@ -177,14 +176,14 @@ exit:
   79.45  // ----------------------------------------------------------------------------
   79.46  static CMPIStatus Associators(
   79.47  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   79.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   79.50 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   79.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   79.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   79.53 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   79.54  		const char *assocClass,
   79.55  		const char *resultClass,
   79.56  		const char *role,
   79.57  		const char *resultRole,
   79.58 -		char ** properties)		/* [in] List of desired properties (NULL=all). */
   79.59 +		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   79.60  {
   79.61     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   79.62     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   79.63 @@ -270,9 +269,9 @@ exit:
   79.64  // ----------------------------------------------------------------------------
   79.65  static CMPIStatus ReferenceNames(
   79.66  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.67 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   79.68 -		CMPIResult * results,		/* [out] Results of this operation. */
   79.69 -		CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   79.70 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   79.71 +		const CMPIResult * results,		/* [out] Results of this operation. */
   79.72 +		const CMPIObjectPath * reference,	/* [in] Contains the source namespace, classname and object path. */
   79.73  		const char *assocClass, 
   79.74  		const char *role)
   79.75  {
   79.76 @@ -372,12 +371,12 @@ exit:
   79.77  // ----------------------------------------------------------------------------
   79.78  static CMPIStatus References(
   79.79  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.80 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   79.81 -		CMPIResult * results,		/* [out] Results of this operation. */
   79.82 -		CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   79.83 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   79.84 +		const CMPIResult * results,		/* [out] Results of this operation. */
   79.85 +		const CMPIObjectPath * reference,	/* [in] Contains the namespace, classname and desired object path. */
   79.86  		const char *assocClass,
   79.87  		const char *role,
   79.88 -		char **properties)		/* [in] List of desired properties (NULL=all). */
   79.89 +		const char **properties)		/* [in] List of desired properties (NULL=all). */
   79.90  {
   79.91     CMPIStatus status = { CMPI_RC_OK, NULL };    /* Return status of CIM operations. */
   79.92     char *namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
   79.93 @@ -475,15 +474,13 @@ exit:
   79.94  // ----------------------------------------------------------------------------
   79.95  static void AssociationInitialize(
   79.96  		CMPIAssociationMI * self,	/* [in] Handle to this provider (i.e. 'self'). */
   79.97 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   79.98 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
   79.99  {
  79.100     _SBLIM_ENTER("AssociationInitialize");
  79.101     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  79.102     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  79.103  
  79.104     /* Nothing needs to be done to initialize this provider */
  79.105 -
  79.106 -exit:
  79.107     _SBLIM_RETURN();
  79.108  }
  79.109  
    80.1 --- a/src/Xen_VirtualSystemManagementCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
    80.2 +++ b/src/Xen_VirtualSystemManagementCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
    80.3 @@ -32,7 +32,7 @@
    80.4  // ----------------------------------------------------------------------------
    80.5  
    80.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    80.7 -static CMPIBroker *_BROKER;
    80.8 +static const CMPIBroker *_BROKER;
    80.9  
   80.10  /* Include utility functions */
   80.11  #include "cmpiutil.h"
   80.12 @@ -66,7 +66,8 @@ const static char * _KEYNAMES[] = {"Inst
   80.13  // ----------------------------------------------------------------------------
   80.14  static CMPIStatus Cleanup(
   80.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   80.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   80.19  {
   80.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   80.21  
   80.22 @@ -75,8 +76,6 @@ static CMPIStatus Cleanup(
   80.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   80.24  
   80.25     /* Nothing needs to be done for cleanup. */
   80.26 -
   80.27 -exit:
   80.28     _SBLIM_RETURNSTATUS(status);
   80.29  }
   80.30  
   80.31 @@ -86,9 +85,9 @@ exit:
   80.32  // ----------------------------------------------------------------------------
   80.33  static CMPIStatus EnumInstanceNames(
   80.34  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   80.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   80.37 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   80.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   80.40 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   80.41  {
   80.42     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   80.43     _RESOURCES * resources;			/* Handle to the list of system resources. */
   80.44 @@ -166,9 +165,9 @@ exit:
   80.45  // ----------------------------------------------------------------------------
   80.46  static CMPIStatus EnumInstances(
   80.47  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   80.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   80.50 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   80.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   80.53 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   80.54  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   80.55  {
   80.56     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   80.57 @@ -247,9 +246,9 @@ exit:
   80.58  // ----------------------------------------------------------------------------
   80.59  static CMPIStatus GetInstance(
   80.60  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.61 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   80.62 -		CMPIResult * results,		/* [out] Results of this operation. */
   80.63 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.64 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.65 +		const CMPIResult * results,		/* [out] Results of this operation. */
   80.66 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.67  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   80.68  {
   80.69     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   80.70 @@ -332,10 +331,11 @@ exit:
   80.71  // ----------------------------------------------------------------------------
   80.72  static CMPIStatus SetInstance(
   80.73  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.74 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   80.75 -		CMPIResult * results,		/* [out] Results of this operation. */
   80.76 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.77 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   80.78 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.79 +		const CMPIResult * results,		/* [out] Results of this operation. */
   80.80 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.81 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   80.82 +        const char **properties)
   80.83  {
   80.84     _SBLIM_ENTER("SetInstance");
   80.85  
   80.86 @@ -351,10 +351,10 @@ static CMPIStatus SetInstance(
   80.87  // ----------------------------------------------------------------------------
   80.88  static CMPIStatus CreateInstance(
   80.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   80.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   80.91 -		CMPIResult * results,		/* [out] Results of this operation. */
   80.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   80.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   80.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
   80.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   80.97 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   80.98  {
   80.99     _SBLIM_ENTER("CreateInstance");
  80.100  
  80.101 @@ -370,9 +370,9 @@ static CMPIStatus CreateInstance(
  80.102  // ----------------------------------------------------------------------------
  80.103  static CMPIStatus DeleteInstance(
  80.104  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  80.105 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  80.106 -		CMPIResult * results,		/* [out] Results of this operation. */
  80.107 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  80.108 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  80.109 +		const CMPIResult * results,		/* [out] Results of this operation. */
  80.110 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  80.111  {
  80.112     _SBLIM_ENTER("DeleteInstance");
  80.113  
  80.114 @@ -389,11 +389,11 @@ static CMPIStatus DeleteInstance(
  80.115  // ----------------------------------------------------------------------------
  80.116  static CMPIStatus ExecQuery(
  80.117  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  80.118 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  80.119 -		CMPIResult * results,		/* [out] Results of this operation. */
  80.120 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  80.121 -		char * language,		/* [in] Name of the query language. */
  80.122 -		char * query)			/* [in] Text of the query written in the query language. */
  80.123 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  80.124 +		const CMPIResult * results,		/* [out] Results of this operation. */
  80.125 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  80.126 +		const char * language,		/* [in] Name of the query language. */
  80.127 +		const char * query)			/* [in] Text of the query written in the query language. */
  80.128  {
  80.129     _SBLIM_ENTER("ExecQuery");
  80.130  
  80.131 @@ -413,15 +413,13 @@ static CMPIStatus ExecQuery(
  80.132  // ----------------------------------------------------------------------------
  80.133  static void Initialize(
  80.134  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  80.135 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  80.136 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  80.137  {
  80.138     _SBLIM_ENTER("Initialize");
  80.139     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  80.140     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  80.141  
  80.142     /* Nothing needs to be done to initialize this provider */
  80.143 -
  80.144 -exit:
  80.145     _SBLIM_RETURN();
  80.146  }
  80.147  
    81.1 --- a/src/Xen_VirtualSystemManagementCapabilities_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    81.2 +++ b/src/Xen_VirtualSystemManagementCapabilities_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    81.3 @@ -82,7 +82,7 @@ int Xen_VirtualSystemManagementCapabilit
    81.4  // ----------------------------------------------------------------------------
    81.5  
    81.6  /* Get the specific resource that matches the CMPI object path. */
    81.7 -int Xen_VirtualSystemManagementCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
    81.8 +int Xen_VirtualSystemManagementCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
    81.9  {
   81.10     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   81.11  
   81.12 @@ -126,7 +126,7 @@ int Xen_VirtualSystemManagementCapabilit
   81.13  // ---------------------------------------------------------------------------- 
   81.14  
   81.15  /* Set the property values of a CMPI instance from a specific resource. */
   81.16 -int Xen_VirtualSystemManagementCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   81.17 +int Xen_VirtualSystemManagementCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   81.18  {
   81.19     if (resource == NULL) return 0;
   81.20     if (CMIsNullObject(instance)) return 0;
   81.21 @@ -178,7 +178,7 @@ int Xen_VirtualSystemManagementCapabilit
   81.22  // ----------------------------------------------------------------------------
   81.23  
   81.24  /* Modify the specified resource using the property values of a CMPI instance. */
   81.25 -int Xen_VirtualSystemManagementCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   81.26 +int Xen_VirtualSystemManagementCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   81.27  {
   81.28     /* Unsupported. */
   81.29     return -1;
   81.30 @@ -187,7 +187,7 @@ int Xen_VirtualSystemManagementCapabilit
   81.31  // ----------------------------------------------------------------------------
   81.32  
   81.33  /* Create a new resource using the property values of a CMPI instance. */
   81.34 -int Xen_VirtualSystemManagementCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   81.35 +int Xen_VirtualSystemManagementCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   81.36  {
   81.37     /* Unsupported. */
   81.38     return -1;
    82.1 --- a/src/Xen_VirtualSystemManagementCapabilities_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    82.2 +++ b/src/Xen_VirtualSystemManagementCapabilities_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    82.3 @@ -63,13 +63,13 @@ int Xen_VirtualSystemManagementCapabilit
    82.4  int Xen_VirtualSystemManagementCapabilities_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
    82.5  
    82.6  /* Get the specific resource that matches the CMPI object path. */
    82.7 -int Xen_VirtualSystemManagementCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
    82.8 +int Xen_VirtualSystemManagementCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
    82.9  
   82.10  /* Free/deallocate/cleanup a resource after use. */
   82.11  int Xen_VirtualSystemManagementCapabilities_freeResource( _RESOURCE * resource );
   82.12  
   82.13  /* Set the property values of a CMPI instance from a specific resource. */
   82.14 -int Xen_VirtualSystemManagementCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   82.15 +int Xen_VirtualSystemManagementCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   82.16  
   82.17  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   82.18  
   82.19 @@ -77,8 +77,8 @@ int Xen_VirtualSystemManagementCapabilit
   82.20  int Xen_VirtualSystemManagementCapabilities_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   82.21  
   82.22  /* Modify the specified resource using the property values of a CMPI instance. */
   82.23 -int Xen_VirtualSystemManagementCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   82.24 +int Xen_VirtualSystemManagementCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   82.25  
   82.26  /* Create a new resource using the property values of a CMPI instance. */
   82.27 -int Xen_VirtualSystemManagementCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   82.28 +int Xen_VirtualSystemManagementCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   82.29  
    83.1 --- a/src/Xen_VirtualSystemManagementService.c	Fri Oct 20 13:20:15 2006 -0600
    83.2 +++ b/src/Xen_VirtualSystemManagementService.c	Tue Oct 24 11:30:03 2006 -0600
    83.3 @@ -47,7 +47,7 @@
    83.4  // ----------------------------------------------------------------------------
    83.5  
    83.6  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
    83.7 -static CMPIBroker *_BROKER;
    83.8 +static const CMPIBroker *_BROKER;
    83.9  
   83.10  /* Include utility functions */
   83.11  #include "cmpiutil.h"
   83.12 @@ -86,7 +86,8 @@ static CMPIInstance *parse_embedded_inst
   83.13  // ----------------------------------------------------------------------------
   83.14  static CMPIStatus Cleanup(
   83.15  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.16 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   83.17 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.18 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   83.19  {
   83.20     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   83.21  
   83.22 @@ -95,8 +96,6 @@ static CMPIStatus Cleanup(
   83.23     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   83.24  
   83.25     /* Nothing needs to be done for cleanup. */
   83.26 -
   83.27 -exit:
   83.28     _SBLIM_RETURNSTATUS(status);
   83.29  }
   83.30  
   83.31 @@ -106,9 +105,9 @@ exit:
   83.32  // ----------------------------------------------------------------------------
   83.33  static CMPIStatus EnumInstanceNames(
   83.34  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.35 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   83.36 -		CMPIResult * results,		/* [out] Results of this operation. */
   83.37 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   83.38 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.39 +		const CMPIResult * results,		/* [out] Results of this operation. */
   83.40 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   83.41  {
   83.42     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   83.43     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   83.44 @@ -191,9 +190,9 @@ exit:
   83.45  // ----------------------------------------------------------------------------
   83.46  static CMPIStatus EnumInstances(
   83.47  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.48 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   83.49 -		CMPIResult * results,		/* [out] Results of this operation. */
   83.50 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   83.51 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.52 +		const CMPIResult * results,		/* [out] Results of this operation. */
   83.53 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   83.54  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   83.55  {
   83.56     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   83.57 @@ -277,9 +276,9 @@ exit:
   83.58  // ----------------------------------------------------------------------------
   83.59  static CMPIStatus GetInstance(
   83.60  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.61 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   83.62 -		CMPIResult * results,		/* [out] Results of this operation. */
   83.63 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.64 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.65 +		const CMPIResult * results,		/* [out] Results of this operation. */
   83.66 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.67  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   83.68  {
   83.69     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   83.70 @@ -367,10 +366,11 @@ exit:
   83.71  // ----------------------------------------------------------------------------
   83.72  static CMPIStatus SetInstance(
   83.73  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.74 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   83.75 -		CMPIResult * results,		/* [out] Results of this operation. */
   83.76 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.77 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   83.78 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.79 +		const CMPIResult * results,		/* [out] Results of this operation. */
   83.80 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.81 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   83.82 +        const char **properties)
   83.83  {
   83.84     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   83.85     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
   83.86 @@ -444,10 +444,10 @@ exit:
   83.87  // ----------------------------------------------------------------------------
   83.88  static CMPIStatus CreateInstance(
   83.89  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   83.90 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   83.91 -		CMPIResult * results,		/* [out] Results of this operation. */
   83.92 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.93 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   83.94 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   83.95 +		const CMPIResult * results,		/* [out] Results of this operation. */
   83.96 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   83.97 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   83.98  {
   83.99     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  83.100     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  83.101 @@ -528,9 +528,9 @@ exit:
  83.102  // ----------------------------------------------------------------------------
  83.103  static CMPIStatus DeleteInstance(
  83.104  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  83.105 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  83.106 -		CMPIResult * results,		/* [out] Results of this operation. */
  83.107 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  83.108 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  83.109 +		const CMPIResult * results,		/* [out] Results of this operation. */
  83.110 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  83.111  {
  83.112     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  83.113     _RESOURCES * resources = NULL;			/* Handle to the list of system resources. */
  83.114 @@ -604,11 +604,11 @@ exit:
  83.115  // ----------------------------------------------------------------------------
  83.116  static CMPIStatus ExecQuery(
  83.117  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  83.118 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  83.119 -		CMPIResult * results,		/* [out] Results of this operation. */
  83.120 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  83.121 -		char * language,		/* [in] Name of the query language. */
  83.122 -		char * query)			/* [in] Text of the query written in the query language. */
  83.123 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  83.124 +		const CMPIResult * results,		/* [out] Results of this operation. */
  83.125 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  83.126 +		const char * language,		/* [in] Name of the query language. */
  83.127 +		const char * query)			/* [in] Text of the query written in the query language. */
  83.128  {
  83.129     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  83.130     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  83.131 @@ -642,15 +642,13 @@ exit:
  83.132  // ----------------------------------------------------------------------------
  83.133  static void Initialize(
  83.134  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  83.135 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  83.136 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  83.137  {
  83.138     _SBLIM_ENTER("Initialize");
  83.139     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  83.140     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  83.141  
  83.142     /* Nothing needs to be done to initialize this provider */
  83.143 -
  83.144 -exit:
  83.145     _SBLIM_RETURN();
  83.146  }
  83.147  
  83.148 @@ -670,8 +668,9 @@ CMInstanceMIStub( , Xen_VirtualSystemMan
  83.149  // Perform any necessary cleanup immediately before this provider is unloaded.
  83.150  // ----------------------------------------------------------------------------
  83.151  static CMPIStatus MethodCleanup(
  83.152 -		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  83.153 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  83.154 +		CMPIMethodMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  83.155 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  83.156 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
  83.157  {
  83.158     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
  83.159  
  83.160 @@ -680,8 +679,6 @@ static CMPIStatus MethodCleanup(
  83.161     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  83.162  
  83.163     /* Nothing needs to be done for cleanup. */
  83.164 -
  83.165 -exit:
  83.166     _SBLIM_RETURNSTATUS(status);
  83.167  }
  83.168  
  83.169 @@ -691,11 +688,11 @@ exit:
  83.170  // ----------------------------------------------------------------------------
  83.171  static CMPIStatus InvokeMethod(
  83.172  		CMPIMethodMI * self,		/* [in] Handle to this provider (i.e. 'self') */
  83.173 -		CMPIContext * context,		/* [in] Additional context info, if any */
  83.174 -		CMPIResult * results,		/* [out] Results of this operation */
  83.175 -		CMPIObjectPath * reference,	/* [in] Contains the CIM namespace, classname and desired object path */
  83.176 -		char * methodname,		/* [in] Name of the method to apply against the reference object */
  83.177 -		CMPIArgs * argsin,		/* [in] Method input arguments */
  83.178 +		const CMPIContext * context,		/* [in] Additional context info, if any */
  83.179 +		const CMPIResult * results,		/* [out] Results of this operation */
  83.180 +		const CMPIObjectPath * reference,	/* [in] Contains the CIM namespace, classname and desired object path */
  83.181 +		const char * methodname,		/* [in] Name of the method to apply against the reference object */
  83.182 +		const CMPIArgs * argsin,		/* [in] Method input arguments */
  83.183  		CMPIArgs * argsout)		/* [in] Method output arguments */
  83.184  {
  83.185     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations */
  83.186 @@ -922,8 +919,6 @@ exit:
  83.187  CMMethodMIStub( , Xen_VirtualSystemManagementService, _BROKER, CMNoHook);
  83.188  
  83.189  
  83.190 -
  83.191 -
  83.192  static struct xm_config *settings2config(char *vsSettings, CMPIArray *resourceSettings)
  83.193  {
  83.194     CMPIInstance *instance;
    84.1 --- a/src/Xen_VirtualSystemManagementService_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    84.2 +++ b/src/Xen_VirtualSystemManagementService_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    84.3 @@ -15,11 +15,12 @@
    84.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    84.5  // ============================================================================
    84.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    84.7 -// Contributors:
    84.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    84.9  // Description:
   84.10  // ============================================================================
   84.11  
   84.12  #include <string.h>
   84.13 +#include <stdlib.h>
   84.14  #include <unistd.h>
   84.15  
   84.16  #include "Xen_VirtualSystemManagementService_Resource.h"
   84.17 @@ -97,7 +98,7 @@ int Xen_VirtualSystemManagementService_g
   84.18  // ----------------------------------------------------------------------------
   84.19  
   84.20  /* Get the specific resource that matches the CMPI object path. */
   84.21 -int Xen_VirtualSystemManagementService_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   84.22 +int Xen_VirtualSystemManagementService_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   84.23  {
   84.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   84.25  
   84.26 @@ -150,7 +151,7 @@ int Xen_VirtualSystemManagementService_f
   84.27  // ---------------------------------------------------------------------------- 
   84.28  
   84.29  /* Set the property values of a CMPI instance from a specific resource. */
   84.30 -int Xen_VirtualSystemManagementService_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   84.31 +int Xen_VirtualSystemManagementService_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   84.32  {
   84.33     if (resource == NULL) return 0;
   84.34     if (CMIsNullObject(instance)) return 0;
   84.35 @@ -190,7 +191,7 @@ int Xen_VirtualSystemManagementService_d
   84.36  // ----------------------------------------------------------------------------
   84.37  
   84.38  /* Modify the specified resource using the property values of a CMPI instance. */
   84.39 -int Xen_VirtualSystemManagementService_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   84.40 +int Xen_VirtualSystemManagementService_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   84.41  {
   84.42     /* Unsupported. */
   84.43     return -1;
   84.44 @@ -199,7 +200,7 @@ int Xen_VirtualSystemManagementService_s
   84.45  // ----------------------------------------------------------------------------
   84.46  
   84.47  /* Create a new resource using the property values of a CMPI instance. */
   84.48 -int Xen_VirtualSystemManagementService_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   84.49 +int Xen_VirtualSystemManagementService_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   84.50  {
   84.51     /* Unsupported. */
   84.52     return -1;
    85.1 --- a/src/Xen_VirtualSystemManagementService_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    85.2 +++ b/src/Xen_VirtualSystemManagementService_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    85.3 @@ -15,7 +15,7 @@
    85.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    85.5  // ============================================================================
    85.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    85.7 -// Contributors:
    85.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    85.9  // Description:
   85.10  // ============================================================================
   85.11  
   85.12 @@ -67,13 +67,13 @@ int Xen_VirtualSystemManagementService_f
   85.13  int Xen_VirtualSystemManagementService_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   85.14  
   85.15  /* Get the specific resource that matches the CMPI object path. */
   85.16 -int Xen_VirtualSystemManagementService_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   85.17 +int Xen_VirtualSystemManagementService_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   85.18  
   85.19  /* Free/deallocate/cleanup a resource after use. */
   85.20  int Xen_VirtualSystemManagementService_freeResource( _RESOURCE * resource );
   85.21  
   85.22  /* Set the property values of a CMPI instance from a specific resource. */
   85.23 -int Xen_VirtualSystemManagementService_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   85.24 +int Xen_VirtualSystemManagementService_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   85.25  
   85.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   85.27  
   85.28 @@ -81,8 +81,8 @@ int Xen_VirtualSystemManagementService_s
   85.29  int Xen_VirtualSystemManagementService_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   85.30  
   85.31  /* Modify the specified resource using the property values of a CMPI instance. */
   85.32 -int Xen_VirtualSystemManagementService_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   85.33 +int Xen_VirtualSystemManagementService_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   85.34  
   85.35  /* Create a new resource using the property values of a CMPI instance. */
   85.36 -int Xen_VirtualSystemManagementService_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   85.37 +int Xen_VirtualSystemManagementService_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   85.38  
    86.1 --- a/src/Xen_VirtualizationCapabilities.c	Fri Oct 20 13:20:15 2006 -0600
    86.2 +++ b/src/Xen_VirtualizationCapabilities.c	Tue Oct 24 11:30:03 2006 -0600
    86.3 @@ -15,7 +15,7 @@
    86.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    86.5  // ============================================================================
    86.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    86.7 -// Contributors:
    86.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    86.9  // Description:
   86.10  // ============================================================================
   86.11  
   86.12 @@ -30,7 +30,7 @@
   86.13  // ----------------------------------------------------------------------------
   86.14  
   86.15  /* Handle to the CIM broker. Initialized when the provider lib is loaded. */
   86.16 -static CMPIBroker *_BROKER;
   86.17 +static const CMPIBroker *_BROKER;
   86.18  
   86.19  /* Include utility functions */
   86.20  #include "cmpiutil.h"
   86.21 @@ -64,7 +64,8 @@ const static char * _KEYNAMES[] = {"Inst
   86.22  // ----------------------------------------------------------------------------
   86.23  static CMPIStatus Cleanup(
   86.24  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.25 -		CMPIContext * context)		/* [in] Additional context info, if any. */
   86.26 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   86.27 +        CMPIBoolean terminating)   /* [in] True if MB is terminating */
   86.28  {
   86.29     CMPIStatus status = { CMPI_RC_OK, NULL };	/* Return status of CIM operations. */
   86.30  
   86.31 @@ -73,8 +74,6 @@ static CMPIStatus Cleanup(
   86.32     _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
   86.33  
   86.34     /* Nothing needs to be done for cleanup. */
   86.35 -
   86.36 -exit:
   86.37     _SBLIM_RETURNSTATUS(status);
   86.38  }
   86.39  
   86.40 @@ -84,9 +83,9 @@ exit:
   86.41  // ----------------------------------------------------------------------------
   86.42  static CMPIStatus EnumInstanceNames(
   86.43  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.44 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   86.45 -		CMPIResult * results,		/* [out] Results of this operation. */
   86.46 -		CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   86.47 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   86.48 +		const CMPIResult * results,		/* [out] Results of this operation. */
   86.49 +		const CMPIObjectPath * reference) 	/* [in] Contains target namespace and classname. */
   86.50  {
   86.51     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   86.52     _RESOURCES * resources;			/* Handle to the list of system resources. */
   86.53 @@ -164,9 +163,9 @@ exit:
   86.54  // ----------------------------------------------------------------------------
   86.55  static CMPIStatus EnumInstances(
   86.56  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.57 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   86.58 -		CMPIResult * results,		/* [out] Results of this operation. */
   86.59 -		CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   86.60 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   86.61 +		const CMPIResult * results,		/* [out] Results of this operation. */
   86.62 +		const CMPIObjectPath * reference,	/* [in] Contains target namespace and classname. */
   86.63  		const char ** properties)	/* [in] List of desired properties (NULL=all). */
   86.64  {
   86.65     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   86.66 @@ -245,9 +244,9 @@ exit:
   86.67  // ----------------------------------------------------------------------------
   86.68  static CMPIStatus GetInstance(
   86.69  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.70 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   86.71 -		CMPIResult * results,		/* [out] Results of this operation. */
   86.72 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   86.73 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   86.74 +		const CMPIResult * results,		/* [out] Results of this operation. */
   86.75 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   86.76  		const char ** properties)		/* [in] List of desired properties (NULL=all). */
   86.77  {
   86.78     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   86.79 @@ -330,10 +329,11 @@ exit:
   86.80  // ----------------------------------------------------------------------------
   86.81  static CMPIStatus SetInstance(
   86.82  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.83 -		CMPIContext * context,		/* [in] Additional context info, if any. */
   86.84 -		CMPIResult * results,		/* [out] Results of this operation. */
   86.85 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   86.86 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
   86.87 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
   86.88 +		const CMPIResult * results,		/* [out] Results of this operation. */
   86.89 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
   86.90 +		const CMPIInstance * newinstance,	/* [in] Contains the new instance data. */
   86.91 +        const char **properties)
   86.92  {
   86.93     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   86.94     _RESOURCES * resources;			/* Handle to the list of system resources. */
   86.95 @@ -402,10 +402,10 @@ exit:
   86.96  // ----------------------------------------------------------------------------
   86.97  static CMPIStatus CreateInstance(
   86.98  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
   86.99 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  86.100 -		CMPIResult * results,		/* [out] Results of this operation. */
  86.101 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  86.102 -		CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  86.103 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  86.104 +		const CMPIResult * results,		/* [out] Results of this operation. */
  86.105 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace, classname and object path. */
  86.106 +		const CMPIInstance * newinstance)	/* [in] Contains the new instance data. */
  86.107  {
  86.108     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  86.109     _RESOURCES * resources;			/* Handle to the list of system resources. */
  86.110 @@ -481,9 +481,9 @@ exit:
  86.111  // ----------------------------------------------------------------------------
  86.112  static CMPIStatus DeleteInstance(
  86.113  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  86.114 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  86.115 -		CMPIResult * results,		/* [out] Results of this operation. */
  86.116 -		CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  86.117 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  86.118 +		const CMPIResult * results,		/* [out] Results of this operation. */
  86.119 +		const CMPIObjectPath * reference)	/* [in] Contains the target namespace, classname and object path. */
  86.120  {
  86.121     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
  86.122     _RESOURCES * resources;			/* Handle to the list of system resources. */
  86.123 @@ -552,11 +552,11 @@ exit:
  86.124  // ----------------------------------------------------------------------------
  86.125  static CMPIStatus ExecQuery(
  86.126  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  86.127 -		CMPIContext * context,		/* [in] Additional context info, if any. */
  86.128 -		CMPIResult * results,		/* [out] Results of this operation. */
  86.129 -		CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  86.130 -		char * language,		/* [in] Name of the query language. */
  86.131 -		char * query)			/* [in] Text of the query written in the query language. */
  86.132 +		const CMPIContext * context,		/* [in] Additional context info, if any. */
  86.133 +		const CMPIResult * results,		/* [out] Results of this operation. */
  86.134 +		const CMPIObjectPath * reference,	/* [in] Contains the target namespace and classname. */
  86.135 +		const char * language,		/* [in] Name of the query language. */
  86.136 +		const char * query)			/* [in] Text of the query written in the query language. */
  86.137  {
  86.138     CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations. */
  86.139     char * namespace = CMGetCharPtr(CMGetNameSpace(reference, NULL)); /* Target namespace. */
  86.140 @@ -585,15 +585,13 @@ exit:
  86.141  // ----------------------------------------------------------------------------
  86.142  static void Initialize(
  86.143  		CMPIInstanceMI * self,		/* [in] Handle to this provider (i.e. 'self'). */
  86.144 -		CMPIContext * context)		/* [in] Additional context info, if any. */
  86.145 +		const CMPIContext * context)		/* [in] Additional context info, if any. */
  86.146  {
  86.147     _SBLIM_ENTER("Initialize");
  86.148     _SBLIM_TRACE(2, ("--- self=\"%s\"", self->ft->miName));
  86.149     //   _SBLIM_TRACE(2, ("--- context=\"%s\"", CMGetCharPtr(CDToString(_BROKER, context, NULL))));
  86.150  
  86.151     /* Nothing needs to be done to initialize this provider */
  86.152 -
  86.153 -exit:
  86.154     _SBLIM_RETURN();
  86.155  }
  86.156  
    87.1 --- a/src/Xen_VirtualizationCapabilities_Resource.c	Fri Oct 20 13:20:15 2006 -0600
    87.2 +++ b/src/Xen_VirtualizationCapabilities_Resource.c	Tue Oct 24 11:30:03 2006 -0600
    87.3 @@ -15,11 +15,12 @@
    87.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    87.5  // ============================================================================
    87.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    87.7 -// Contributors:
    87.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    87.9  // Description:
   87.10  // ============================================================================
   87.11  
   87.12  #include <string.h>
   87.13 +#include <stdlib.h>
   87.14  
   87.15  #include "Xen_VirtualizationCapabilities_Resource.h"
   87.16  
   87.17 @@ -109,7 +110,7 @@ int Xen_VirtualizationCapabilities_getNe
   87.18  // ----------------------------------------------------------------------------
   87.19  
   87.20  /* Get the specific resource that matches the CMPI object path. */
   87.21 -int Xen_VirtualizationCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath )
   87.22 +int Xen_VirtualizationCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath )
   87.23  {
   87.24     CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations. */
   87.25  
   87.26 @@ -179,7 +180,7 @@ int Xen_VirtualizationCapabilities_freeR
   87.27  // ---------------------------------------------------------------------------- 
   87.28  
   87.29  /* Set the property values of a CMPI instance from a specific resource. */
   87.30 -int Xen_VirtualizationCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources )
   87.31 +int Xen_VirtualizationCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources )
   87.32  {
   87.33     if (resource == NULL) return 0;
   87.34     if (CMIsNullObject(instance)) return 0;
   87.35 @@ -206,7 +207,7 @@ int Xen_VirtualizationCapabilities_delet
   87.36  // ----------------------------------------------------------------------------
   87.37  
   87.38  /* Modify the specified resource using the property values of a CMPI instance. */
   87.39 -int Xen_VirtualizationCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker )
   87.40 +int Xen_VirtualizationCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker )
   87.41  {
   87.42     /* Unsupported. */
   87.43     return -1;
   87.44 @@ -215,7 +216,7 @@ int Xen_VirtualizationCapabilities_setRe
   87.45  // ----------------------------------------------------------------------------
   87.46  
   87.47  /* Create a new resource using the property values of a CMPI instance. */
   87.48 -int Xen_VirtualizationCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker )
   87.49 +int Xen_VirtualizationCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker )
   87.50  {
   87.51     /* Unsupported. */
   87.52     return -1;
    88.1 --- a/src/Xen_VirtualizationCapabilities_Resource.h	Fri Oct 20 13:20:15 2006 -0600
    88.2 +++ b/src/Xen_VirtualizationCapabilities_Resource.h	Tue Oct 24 11:30:03 2006 -0600
    88.3 @@ -15,7 +15,7 @@
    88.4  //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    88.5  // ============================================================================
    88.6  // Authors:       Dr. Gareth S. Bestor, <bestor@us.ibm.com>
    88.7 -// Contributors:
    88.8 +// Contributors:  Jim Fehlig, <jfehlig@novell.com>
    88.9  // Description:
   88.10  // ============================================================================
   88.11  
   88.12 @@ -65,13 +65,13 @@ int Xen_VirtualizationCapabilities_freeR
   88.13  int Xen_VirtualizationCapabilities_getNextResource( _RESOURCES * resources, _RESOURCE ** resource );
   88.14  
   88.15  /* Get the specific resource that matches the CMPI object path. */
   88.16 -int Xen_VirtualizationCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, CMPIObjectPath * objectpath );
   88.17 +int Xen_VirtualizationCapabilities_getResourceForObjectPath( _RESOURCES * resources, _RESOURCE ** resource, const CMPIObjectPath * objectpath );
   88.18  
   88.19  /* Free/deallocate/cleanup a resource after use. */
   88.20  int Xen_VirtualizationCapabilities_freeResource( _RESOURCE * resource );
   88.21  
   88.22  /* Set the property values of a CMPI instance from a specific resource. */
   88.23 -int Xen_VirtualizationCapabilities_setInstanceFromResource( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker, _RESOURCES * resources );
   88.24 +int Xen_VirtualizationCapabilities_setInstanceFromResource( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker, _RESOURCES * resources );
   88.25  
   88.26  // THE FOLLOWING METHODS MAY/NOT BE SUPPORTED BY THE SYSTEM FOR THIS CLASS
   88.27  
   88.28 @@ -79,8 +79,8 @@ int Xen_VirtualizationCapabilities_setIn
   88.29  int Xen_VirtualizationCapabilities_deleteResource( _RESOURCES * resources, _RESOURCE * resource );
   88.30  
   88.31  /* Modify the specified resource using the property values of a CMPI instance. */
   88.32 -int Xen_VirtualizationCapabilities_setResourceFromInstance( _RESOURCE * resource, CMPIInstance * instance, CMPIBroker * broker );
   88.33 +int Xen_VirtualizationCapabilities_setResourceFromInstance( _RESOURCE * resource, const CMPIInstance * instance, const CMPIBroker * broker );
   88.34  
   88.35  /* Create a new resource using the property values of a CMPI instance. */
   88.36 -int Xen_VirtualizationCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, CMPIInstance * instance, CMPIBroker * broker );
   88.37 +int Xen_VirtualizationCapabilities_createResourceFromInstance( _RESOURCES * resources, _RESOURCE ** resource, const CMPIInstance * instance, const CMPIBroker * broker );
   88.38  
    89.1 --- a/src/cmpiutil.c	Fri Oct 20 13:20:15 2006 -0600
    89.2 +++ b/src/cmpiutil.c	Tue Oct 24 11:30:03 2006 -0600
    89.3 @@ -34,7 +34,7 @@
    89.4  /* ------------------------------------------------------------------------- */
    89.5  
    89.6  /* CMNewInstance() substitute that does the prerequisite CMNewObjectPath() for you. */
    89.7 -CMPIInstance * _CMNewInstance(CMPIBroker *mb, char *ns, char *cn, CMPIStatus *rc)
    89.8 +CMPIInstance * _CMNewInstance(const CMPIBroker *mb, char *ns, char *cn, CMPIStatus *rc)
    89.9  {
   89.10     CMPIStatus status = {CMPI_RC_OK, NULL}; /* Return status of CIM operations. */
   89.11  
    90.1 --- a/src/cmpiutil.h	Fri Oct 20 13:20:15 2006 -0600
    90.2 +++ b/src/cmpiutil.h	Tue Oct 24 11:30:03 2006 -0600
    90.3 @@ -36,7 +36,7 @@
    90.4  #endif
    90.5  
    90.6  /* Useful shortcut for CMNewInstance(broker, CMNewObjectPath(broker,ns,cn,rc), rc). */
    90.7 -CMPIInstance * _CMNewInstance(CMPIBroker *mb, char *ns, char *cn, CMPIStatus *rc);
    90.8 +CMPIInstance * _CMNewInstance(const CMPIBroker *mb, char *ns, char *cn, CMPIStatus *rc);
    90.9  
   90.10  /* Useful boolean constants. */
   90.11  #ifndef CMPI_true