File cmpi-api-fixes.patch of Package smis-providers

Overview Repositories Revisions Requests Users Attributes Meta

File cmpi-api-fixes.patch of Package smis-providers (Revision 4f28c3499fed764e2488116e35bfac0f)

Currently displaying revision 4f28c3499fed764e2488116e35bfac0f , Show latest

diff -wruN -x '*~' ../orig-smis-providers/src/providers/Array-Profile/CopyServicesExtrinsic.c ./src/providers/Array-Profile/CopyServicesExtrinsic.c
--- ../orig-smis-providers/src/providers/Array-Profile/CopyServicesExtrinsic.c	2008-12-22 10:28:56.000000000 +0100
+++ ./src/providers/Array-Profile/CopyServicesExtrinsic.c	2010-07-27 13:41:12.000000000 +0200
@@ -277,7 +277,7 @@
 		_SMI_TRACE(1,("inArgCount to CreateOrModifyElementFromStoragePool is %d",inArgCount));
 		outArgCount = CMGetArgCount(out2, pStatus);
 		_SMI_TRACE(1,("inArgCount to CreateOrModifyElementFromStoragePool is %d",outArgCount));
-		_SMI_TRACE(1,("cop  %u",*_BROKER->bft->enumInstanceNames));
+		_SMI_TRACE(1,("cop  %u",*_BROKER->bft->enumerateInstanceNames));
 		_SMI_TRACE(1,("cop  %u",*_BROKER->bft->invokeMethod));
 		//_SMI_TRACE(1,("cop  String class Nmae %s",CMObjectPathToString(cop,NULL)));
 		
@@ -320,7 +320,7 @@
 			oPath = CMNewObjectPath(_BROKER, CMGetCharPtr(CMGetNameSpace(cop, pStatus)), 
 				"OMC_LogicalDisk", pStatus);
 
-			en = _BROKER->bft->enumInstanceNames(_BROKER, context, oPath, pStatus);
+			en = _BROKER->bft->enumerateInstanceNames(_BROKER, context, oPath, pStatus);
 			_SMI_TRACE(1,("CBEnumInstance ---- rc= %d",pStatus->rc));
 			if(pStatus->rc != CMPI_RC_OK)
 			{
@@ -336,7 +336,7 @@
 			oPath = CMNewObjectPath(_BROKER, CMGetCharPtr(CMGetNameSpace(cop, pStatus)), 
 				"OMC_LogicalDisk", pStatus);
 
-			en = _BROKER->bft->enumInstanceNames(_BROKER, context, oPath, pStatus);
+			en = _BROKER->bft->enumerateInstanceNames(_BROKER, context, oPath, pStatus);
 			_SMI_TRACE(1,("CBEnumInstance ---- rc= %d",pStatus->rc));
 			if(pStatus->rc != CMPI_RC_OK)
 			{
diff -wruN -x '*~' ../orig-smis-providers/src/providers/copy-services-profile/CopyServicesProvider.c ./src/providers/copy-services-profile/CopyServicesProvider.c
--- ../orig-smis-providers/src/providers/copy-services-profile/CopyServicesProvider.c	2009-01-23 07:00:25.000000000 +0100
+++ ./src/providers/copy-services-profile/CopyServicesProvider.c	2010-07-27 13:39:06.000000000 +0200
@@ -461,7 +461,7 @@
 					CMSetStatusWithChars(omc_csp_broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 					return rc;
 				}
-				en = omc_csp_broker->bft->enumInstanceNames(omc_csp_broker, ctx, oPath, &rc);
+				en = omc_csp_broker->bft->enumerateInstanceNames(omc_csp_broker, ctx, oPath, &rc);
 				if(rc.rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstanceName SCS\n");
@@ -630,7 +630,7 @@
 					CMSetStatusWithChars(omc_csp_broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 					return rc;
 				}
-				en = omc_csp_broker->bft->enumInstances(omc_csp_broker, ctx, oPath, properties, &rc);
+				en = omc_csp_broker->bft->enumerateInstances(omc_csp_broker, ctx, oPath, properties, &rc);
 				if(rc.rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstance SCS\n");
diff -wruN -x '*~' ../orig-smis-providers/src/providers/copy-services-profile/StorageReplicationElementCapabilities.c ./src/providers/copy-services-profile/StorageReplicationElementCapabilities.c
--- ../orig-smis-providers/src/providers/copy-services-profile/StorageReplicationElementCapabilities.c	2008-09-24 13:18:42.000000000 +0200
+++ ./src/providers/copy-services-profile/StorageReplicationElementCapabilities.c	2010-07-27 13:41:33.000000000 +0200
@@ -50,7 +50,7 @@
 		CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 		goto Exit;
 	}
-	en = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
+	en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
 	if(rc->rc != CMPI_RC_OK)
 	{
 		DebugMsg("Unable to enumInstanceName SCS\n");
@@ -140,7 +140,7 @@
 		CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 		goto Exit;
 	}
-	en = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
+	en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
 	if(rc->rc != CMPI_RC_OK)
 	{
 		DebugMsg("Unable to enumInstanceName SCS\n");
diff -wruN -x '*~' ../orig-smis-providers/src/providers/copy-services-profile/StorageSynchronized.c ./src/providers/copy-services-profile/StorageSynchronized.c
--- ../orig-smis-providers/src/providers/copy-services-profile/StorageSynchronized.c	2008-12-12 10:25:30.000000000 +0100
+++ ./src/providers/copy-services-profile/StorageSynchronized.c	2010-07-27 13:48:13.000000000 +0200
@@ -64,10 +64,10 @@
 			CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 			goto Exit;
 		}
-//	en = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
-/*	if(broker->bft->enumInstanceNames)
+//	en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
+/*	if(broker->bft->enumerateInstanceNames)
 	{
-		en = CBEnumInstanceNames(broker, ctx, oPath, rc); 
+		en = CBEnumerateInstanceNames(broker, ctx, oPath, rc); 
 		if(rc->rc != CMPI_RC_OK)
 		{
 			DebugMsg("Unable to enumInstanceName LD\n");
@@ -77,7 +77,7 @@
 	}
 	else
 	{
-		DebugMsg("broker->bft->enumInstanceNames NULL\n");
+		DebugMsg("broker->bft->enumerateInstanceNames NULL\n");
 	
 		return ;
 	} 
@@ -105,7 +105,7 @@
 		}
 		else if(no_of_volumes > 0)
 		{
-			en2 = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
+			en2 = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
 			if(rc->rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -197,7 +197,7 @@
 	char **snapshot_volumes_list=NULL; 
 	int no_of_volumes=0, rv, i, k;
 	//Vijay
-	//broker->bft->enumInstanceNames = 0x2b6db2483EA3;	
+	//broker->bft->enumerateInstanceNames = 0x2b6db2483EA3;	
 
 	oPath = CMNewObjectPath(broker, CMGetCharPtr(CMGetNameSpace(op, rc)), className, rc);
 	if(CMIsNullObject(oPath))
@@ -207,7 +207,7 @@
 		goto Exit;
 	}
 	DebugMsg("Inside EnumSSInstances 1\n");
-	//en = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
+	//en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
 		/* Get the list of all target class object paths from the CIMOM. */ 
 	en = CBEnumInstanceNames(broker, ctx, oPath, NULL); 
 //	if(rc->rc != CMPI_RC_OK)
@@ -217,7 +217,7 @@
 		CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 		goto Exit;
 	}
-	/*if( broker->bft->enumInstanceNames )
+	/*if( broker->bft->enumerateInstanceNames )
 	{
 
 		en = CBEnumInstanceNames(broker, ctx, oPath, rc); 
@@ -230,7 +230,7 @@
 	}
 	else
 	{
-			DebugMsg("broker->bft->enumInstanceNames\n");
+			DebugMsg("broker->bft->enumerateInstanceNames\n");
 			return;
 	} */
 		
@@ -257,7 +257,7 @@
 		}
 		else if(no_of_volumes > 0)
 		{
-			en2 = broker->bft->enumInstanceNames(broker, ctx, oPath, rc);
+			en2 = broker->bft->enumerateInstanceNames(broker, ctx, oPath, rc);
 			if(rc->rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -514,7 +514,7 @@
 					goto Exit;
 				} 				
 				
-				en = broker->bft->enumInstanceNames(broker, ctx, ldOP, rc);
+				en = broker->bft->enumerateInstanceNames(broker, ctx, ldOP, rc);
 				if(rc->rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstanceName LD\n");
@@ -625,7 +625,7 @@
 					CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 					goto Exit;
 				}
-				en = broker->bft->enumInstanceNames(broker, ctx, ldOP, rc);
+				en = broker->bft->enumerateInstanceNames(broker, ctx, ldOP, rc);
 				if(rc->rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstanceName LD\n");
@@ -761,7 +761,7 @@
 				CMSetStatusWithChars(broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 				goto Exit;
 			}
-			en = broker->bft->enumInstanceNames(broker, ctx, oPath, &rc);
+			en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, &rc);
 			if(rc.rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -850,7 +850,7 @@
 				CMSetStatusWithChars(broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 				goto Exit;
 			}
-			en = broker->bft->enumInstanceNames(broker, ctx, oPath, &rc);
+			en = broker->bft->enumerateInstanceNames(broker, ctx, oPath, &rc);
 			if(rc.rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -931,7 +931,7 @@
 				CMSetStatusWithChars(broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 				goto Exit;
 			}
-			en = broker->bft->enumInstances(broker, ctx, oPath, properties, &rc);
+			en = broker->bft->enumerateInstances(broker, ctx, oPath, properties, &rc);
 			if(rc.rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -1021,7 +1021,7 @@
 				CMSetStatusWithChars(broker, &rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 				goto Exit;
 			}
-			en = broker->bft->enumInstances(broker, ctx, oPath, properties, &rc);
+			en = broker->bft->enumerateInstances(broker, ctx, oPath, properties, &rc);
 			if(rc.rc != CMPI_RC_OK)
 			{
 				DebugMsg("Unable to enumInstanceName LD\n");
@@ -1170,7 +1170,7 @@
 					goto Exit;
 				} 				
 				
-				en = broker->bft->enumInstanceNames(broker, ctx, ldOP, rc);
+				en = broker->bft->enumerateInstanceNames(broker, ctx, ldOP, rc);
 				if(rc->rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstanceName LD\n");
@@ -1248,7 +1248,7 @@
 					CMSetStatusWithChars(broker, rc, CMPI_RC_ERR_FAILED, "CMPI_RC_ERR_FAILED");
 					goto Exit;
 				}
-				en = broker->bft->enumInstanceNames(broker, ctx, ldOP, rc);
+				en = broker->bft->enumerateInstanceNames(broker, ctx, ldOP, rc);
 				if(rc->rc != CMPI_RC_OK)
 				{
 					DebugMsg("Unable to enumInstanceName LD\n");

Places

File cmpi-api-fixes.patch of Package smis-providers (Revision 4f28c3499fed764e2488116e35bfac0f)

Places