Menu
▾
▴
[Sblim-commit] cmpi-devel/cmpi cmpidt.h,1.1.1.1,1.2 cmpift.h,1.1.1.1,1.2 cmpimacs.h,1.1.1.1,1.2
|
From: Viktor M. <mih...@us...> - 2005-05-10 15:50:32
|
Update of /cvsroot/sblim/cmpi-devel/cmpi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11414/cmpi Modified Files: cmpidt.h cmpift.h cmpimacs.h Log Message: Bugs fixed: 1199111. The header files and the C++ wrapper have been brought up to the TOG spec level (1.0). Index: cmpift.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/cmpift.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cmpift.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ cmpift.h 10 May 2005 15:50:20 -0000 1.2 @@ -12,7 +12,7 @@ * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html * * Author: Adrian Schuur <sc...@de...> - * Contributors: + * Contributors: Konrad Rzeszutek <da...@us...> * * Description: CMPI Function Table Definions * @@ -54,7 +54,7 @@ @return The newly created Instance. */ [...1306 lines suppressed...] - CMPISelectExp* se, const char *ns, CMPIObjectPath* op, CMPIBoolean first); + (CMPIIndicationMI* mi, const CMPIContext* ctx, + const CMPISelectExp* se, const char *ns, const CMPIObjectPath* op, CMPIBoolean first); CMPIStatus (*deActivateFilter) - (CMPIIndicationMI* mi, CMPIContext* ctx, CMPIResult* rslt, - CMPISelectExp* se, const char *ns, CMPIObjectPath* op, CMPIBoolean last); - #if defined(CMPI_VER_86) + (CMPIIndicationMI* mi, const CMPIContext* ctx, + const CMPISelectExp* se, const char *ns, const CMPIObjectPath* op, CMPIBoolean last); void (*enableIndications) - (CMPIIndicationMI* mi); + (CMPIIndicationMI* mi, const CMPIContext *); void (*disableIndications) - (CMPIIndicationMI* mi); - #endif // CMPI_VER_86 + (CMPIIndicationMI* mi, const CMPIContext *); + }; Index: cmpidt.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/cmpidt.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cmpidt.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ cmpidt.h 10 May 2005 15:50:19 -0000 1.2 @@ -12,7 +12,7 @@ * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html * * Author: Adrian Schuur <sc...@de...> - * Contributors: + * Contributors: Konrad Rzeszutek <da...@us...> * * Description: CMPI Data Type Definions * @@ -39,7 +39,7 @@ #define CMPIVersion086 86 // 0.86 #define CMPIVersion087 87 // 0.87 #define CMPIVersion090 90 // 0.90 - + #define CMPIVersion100 100 // 1.00 // CMPI_VERSION compile switch should be used during MI compilation only. // It is used define minimal version support needed from Management Broker. @@ -56,11 +56,13 @@ #define CMPI_VER_87 1 #elif (CMPI_VERSION==90) #define CMPI_VER_90 1 + #elif (CMPI_VERSION==100) + #define CMPI_VER_100 1 #else #error Unsupported CMPI_VERSION defined #endif #else - #define CMPI_VER_80 + #define CMPI_VER_100 #endif @@ -75,8 +77,14 @@ // During MI loading MBs must ensure that // <mi-name>_Create<mi-type>MI.miVersion<=<mi-name>_Create<mi-type>MI.ftVersion // If this is not the case, the MI might require higher version MB support. - -#if defined (CMPI_VER_90) || defined(CMPI_VER_ALL) +#if defined (CMPI_VER_100) || defined(CMPI_VER_ALL) + #define CMPI_VER_90 + #define CMPI_VER_87 + #define CMPI_VER_86 + #define CMPI_VER_85 + #define CMPI_VER_80 + #define CMPICurrentVersion CMPIVersion100 +#elif defined (CMPI_VER_90) || defined(CMPI_VER_ALL) // added Ext function table and getKeyList #define CMPI_VER_87 #define CMPI_VER_86 @@ -368,8 +376,15 @@ #define CMPI_FLAG_IncludeQualifiers 4 #define CMPI_FLAG_IncludeClassOrigin 8 + /* Authenticated ID of the user requesting this MI invocation.*/ #define CMPIPrincipal "CMPIPrincipal" + /* CMPIFlags - invocation flags as specified by the client. */ #define CMPIInvocationFlags "CMPIInvocationFlags" + /* Namespace for which the MI is started. */ + #define CMPIInitNameSpace "CMPIInitNameSpace" + /* The role assumed by the current authenticated user.*/ + #define CMPIRole "CMPIRole" + typedef enum _CMPIrc { CMPI_RC_OK =0, @@ -390,6 +405,13 @@ CMPI_RC_ERR_INVALID_QUERY =15, CMPI_RC_ERR_METHOD_NOT_AVAILABLE =16, CMPI_RC_ERR_METHOD_NOT_FOUND =17, + /* The following return codes are used by cleanup() calls only. */ + CMPI_RC_DO_NOT_UNLOAD =50, + CMPI_RC_NEVER_UNLOAD =51, + /* Internal CMPI return codes. */ + CMPI_RC_ERR_INVALID_HANDLE =60, + CMPI_RC_ERR_INVALID_DATA_TYPE =61, + /* Hosting OS errors. */ CMPI_RC_ERROR_SYSTEM =100, CMPI_RC_ERROR =200 } CMPIrc; @@ -413,6 +435,16 @@ #define CMPI_MB_Supports_Qualifier 0x00001000 #define CMPI_MB_Supports_Schema 0x00003000 +#define CMPI_MB_BasicRead 0x00000001 +#define CMPI_MB_BasicWrite 0x00000003 +#define CMPI_MB_InstanceManipulation 0x00000007 +#define CMPI_MB_AssociationTraversal 0x00000009 +#define CMPI_MB_QueryExecution 0x00000011 +#define CMPI_MB_QueryNormalization 0x00000031 +#define CMPI_MB_BasicQualifierSupport 0x00000047 +#define CMPI_MB_OSEncapsulationSupport 0x00000100 + + /* Query Predicate operations */ typedef enum _CMPIPredOp { Index: cmpimacs.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/cmpimacs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cmpimacs.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ cmpimacs.h 10 May 2005 15:50:21 -0000 1.2 @@ -12,7 +12,7 @@ * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html * * Author: Adrian Schuur <sc...@de...> - * Contributors: + * Contributors: Konrad Rzeszutek <da...@us...> * * Description: CMPI Convenience Definions * @@ -65,7 +65,7 @@ @param msg the message as character string @return This macro contains a return statement and leaves the function. [...1117 lines suppressed...] CMPICurrentVersion, \ CMPICurrentVersion, \ @@ -2145,7 +2231,7 @@ #else #define CMPropertyMIFactory(cn,pn) \ CMPI_EXTERN_C \ - CMPIMethodMI* pn##_Create_PropertyMI(CMPIBroker* broker, CMPIContext *ctxp) { \ + CMPIMethodMI* pn##_Create_PropertyMI(const CMPIBroker* broker, const CMPIContext *ctxp, CMPIStatus *rc) { \ static CMPIPropertyMIFT propMIFT={ \ CMPICurrentVersion, \ CMPICurrentVersion, \ @@ -2196,7 +2282,7 @@ #define CMIndicationMIFactory(cn,pn) \ CMPI_EXTERN_C \ - CMPIIndicationMI* pn##_Create_IndicationMI(CMPIBroker* broker, CMPIContext *ctxp) { \ + CMPIIndicationMI* pn##_Create_IndicationMI(const CMPIBroker* broker, const CMPIContext *ctxp, CMPIStatus *rc) { \ static CMPIIndicationMIFT indMIFT={ \ CMPICurrentVersion, \ CMPICurrentVersion, \ |
