Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
systemsmanagement:wbem
sblim-cmpi-smbios
sblim-cmpi-smbios-0.3.2.dif
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File sblim-cmpi-smbios-0.3.2.dif of Package sblim-cmpi-smbios
Index: cmpiLinux_BIOSElement.c =================================================================== --- cmpiLinux_BIOSElement.c.orig +++ cmpiLinux_BIOSElement.c @@ -44,8 +44,8 @@ CMPIBroker * _broker; static char * _ClassName = "Linux_BIOSElement"; -static CMPIObjectPath *makeObjectPath(DMI_BIOSELEMENT *be,CMPIObjectPath *op); -static CMPIInstance *makeInstance(DMI_BIOSELEMENT *be,CMPIObjectPath *op); +static CMPIObjectPath *makeObjectPath(DMI_BIOSELEMENT *be, const CMPIObjectPath *op); +static CMPIInstance *makeInstance(DMI_BIOSELEMENT *be, const CMPIObjectPath *op); /* ---------------------------------------------------------------------------*/ /* Instance Provider Interface */ @@ -53,15 +53,15 @@ static CMPIInstance *makeInstance(DMI_BI CMPIStatus Linux_BIOSElementCleanup( CMPIInstanceMI * mi, - CMPIContext * ctx) { + const CMPIContext * ctx, CMPIBoolean terminating) { cimdmi_term(); CMReturn(CMPI_RC_OK); } CMPIStatus Linux_BIOSElementEnumInstanceNames( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * ref) { + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * ref) { CMPIObjectPath *op; DMI_BIOSELEMENT *bioselem; CMPIStatus rc = {CMPI_RC_OK, NULL}; @@ -89,10 +89,10 @@ CMPIStatus Linux_BIOSElementEnumInstance } CMPIStatus Linux_BIOSElementEnumInstances( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * ref, - char ** properties) { + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * ref, + const char ** properties) { CMPIStatus rc = {CMPI_RC_OK, NULL}; CMPIInstance *inst; DMI_BIOSELEMENT *bioselem; @@ -126,10 +126,10 @@ CMPIStatus Linux_BIOSElementEnumInstance } CMPIStatus Linux_BIOSElementGetInstance( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * cop, - char ** properties) { + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * cop, + const char ** properties) { CMPIInstance *inst; DMI_BIOSELEMENT *bioselem; CMPIStatus rc = {CMPI_RC_OK, NULL}; @@ -163,10 +163,10 @@ CMPIStatus Linux_BIOSElementGetInstance( } CMPIStatus Linux_BIOSElementCreateInstance( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * cop, - CMPIInstance * ci) { + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * cop, + const CMPIInstance * ci) { CMPIStatus rc = {CMPI_RC_OK, NULL}; if( _debug ) fprintf( stderr, "--- %s.c : CMPI CreateInstance()\n", _ClassName ); @@ -175,12 +175,16 @@ CMPIStatus Linux_BIOSElementCreateInstan return rc; } +#if defined(CMPI_VER_100) +CMPIStatus Linux_BIOSElementModifyInstance( CMPIInstanceMI * mi, +#else CMPIStatus Linux_BIOSElementSetInstance( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * cop, - CMPIInstance * ci, - char **properties) { +#endif + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * cop, + const CMPIInstance * ci, + const char **properties) { CMPIStatus rc = {CMPI_RC_OK, NULL}; if( _debug ) fprintf( stderr, "--- %s.c : CMPI SetInstance()\n", _ClassName ); @@ -190,9 +194,9 @@ CMPIStatus Linux_BIOSElementSetInstance( } CMPIStatus Linux_BIOSElementDeleteInstance( CMPIInstanceMI * mi, - CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * cop) { + const CMPIContext * ctx, + const CMPIResult * rslt, + const CMPIObjectPath * cop) { CMPIStatus rc = {CMPI_RC_OK, NULL}; if( _debug ) fprintf( stderr, "--- %s.c : CMPI DeleteInstance()\n", _ClassName ); @@ -203,10 +207,10 @@ CMPIStatus Linux_BIOSElementDeleteInstan CMPIStatus Linux_BIOSElementExecQuery( CMPIInstanceMI * mi, CMPIContext * ctx, - CMPIResult * rslt, - CMPIObjectPath * ref, - char * lang, - char * query) { + const CMPIResult * rslt, + const CMPIObjectPath * ref, + const char * lang, + const char * query) { CMPIStatus rc = {CMPI_RC_OK, NULL}; if( _debug ) fprintf( stderr, "--- %s.c : CMPI ExecQuery()\n", _ClassName ); @@ -220,7 +224,7 @@ CMPIStatus Linux_BIOSElementExecQuery( C /* ---------------------------------------------------------------------------*/ /* private methods */ /* ---------------------------------------------------------------------------*/ -static CMPIObjectPath *makeObjectPath(DMI_BIOSELEMENT *be,CMPIObjectPath *op) +static CMPIObjectPath *makeObjectPath(DMI_BIOSELEMENT *be, const CMPIObjectPath *op) { CMPIObjectPath * iop=NULL; @@ -241,7 +245,7 @@ static CMPIObjectPath *makeObjectPath(DM return iop; } -static CMPIInstance *makeInstance(DMI_BIOSELEMENT *be,CMPIObjectPath *op) +static CMPIInstance *makeInstance(DMI_BIOSELEMENT *be, const CMPIObjectPath *op) { CMPIObjectPath * iop=NULL; CMPIInstance * inst=NULL; Index: cmpiLinux_BIOSFeature.c =================================================================== --- cmpiLinux_BIOSFeature.c.orig +++ cmpiLinux_BIOSFeature.c @@ -169,7 +169,11 @@ CMPIStatus Linux_BIOSFeatureCreateInstan return rc; } +#if defined(CMPI_VER_100) +CMPIStatus Linux_BIOSFeatureModifyInstance( CMPIInstanceMI * mi, +#else CMPIStatus Linux_BIOSFeatureSetInstance( CMPIInstanceMI * mi, +#endif CMPIContext * ctx, CMPIResult * rslt, CMPIObjectPath * cop, Index: cmpiLinux_BIOSFeatureBIOSElements.c =================================================================== --- cmpiLinux_BIOSFeatureBIOSElements.c.orig +++ cmpiLinux_BIOSFeatureBIOSElements.c @@ -187,7 +187,11 @@ CMPIStatus Linux_BIOSFeatureBIOSElements return rc; } +#if defined(CMPI_VER_100) +CMPIStatus Linux_BIOSFeatureBIOSElementsModifyInstance( CMPIInstanceMI * mi, +#else CMPIStatus Linux_BIOSFeatureBIOSElementsSetInstance( CMPIInstanceMI * mi, +#endif CMPIContext * ctx, CMPIResult * rslt, CMPIObjectPath * cop, Index: cmpiLinux_BIOSProduct.c =================================================================== --- cmpiLinux_BIOSProduct.c.orig +++ cmpiLinux_BIOSProduct.c @@ -23,9 +23,9 @@ #include <stdio.h> #include <string.h> -#include "cmpidt.h" -#include "cmpift.h" -#include "cmpimacs.h" +#include <cmpidt.h> +#include <cmpift.h> +#include <cmpimacs.h> #include "dmiinfo.h" @@ -163,7 +163,11 @@ CMPIStatus Linux_BIOSProductCreateInstan return rc; } +#if defined(CMPI_VER_100) +CMPIStatus Linux_BIOSProductModifyInstance( CMPIInstanceMI * mi, +#else CMPIStatus Linux_BIOSProductSetInstance( CMPIInstanceMI * mi, +#endif CMPIContext * ctx, CMPIResult * rslt, CMPIObjectPath * cop, Index: cmpiLinux_BIOSProductBIOSFeatures.c =================================================================== --- cmpiLinux_BIOSProductBIOSFeatures.c.orig +++ cmpiLinux_BIOSProductBIOSFeatures.c @@ -188,7 +188,11 @@ CMPIStatus Linux_BIOSProductBIOSFeatures return rc; } +#if defined(CMPI_VER_100) +CMPIStatus Linux_BIOSProductBIOSFeaturesModifyInstance( CMPIInstanceMI * mi, +#else CMPIStatus Linux_BIOSProductBIOSFeaturesSetInstance( CMPIInstanceMI * mi, +#endif CMPIContext * ctx, CMPIResult * rslt, CMPIObjectPath * cop, Index: dmiinfo.c =================================================================== --- dmiinfo.c.orig +++ dmiinfo.c @@ -71,7 +71,7 @@ void cimdmi_init() /* find DMI anchor */ for (dmif=biosptr;(void*)dmif<(biosptr+bioslen);dmif++) { if (memcmp("_DMI_",dmif->dmi_sig,5)==0) { - printf("DMI Signature found at %08x\n", + printf("DMI Signature found at %08lx\n", (void*)dmif-biosptr+offbios); printf("SMBIOS Structures reside at %08x\n", dmif->dmi_base); Index: dmitest.c =================================================================== --- dmitest.c.orig +++ dmitest.c @@ -67,6 +67,7 @@ int main() popw="not implemented"; break; case 3: + default: popw="unknown"; break; } @@ -81,6 +82,7 @@ int main() adpw="not implemented"; break; case 3: + default: adpw="unknown"; break; } Index: makefile =================================================================== --- makefile.orig +++ makefile @@ -2,8 +2,8 @@ include setting.cmpi -export CFLAGS=-Wall -g -CPPFLAGS=-I $(CIMOMINC) -DDEBUG +export CFLAGS=$(RPM_OPT_FLAGS) -fPIC +export CPPFLAGS=$(RPM_OPT_FLAGS) -I $(CIMOMINC) -DDEBUG LOADLIBES=-ldmiinfo LDFLAGS=-L . @@ -55,4 +55,4 @@ endif ifndef NODEPS include $(DEPFILES) -endif \ No newline at end of file +endif Index: setting.cmpi =================================================================== --- setting.cmpi.orig +++ setting.cmpi @@ -5,8 +5,8 @@ #OPENCIMOM=1 #OPENWBEM=1 -PEGASUS=1 -#STANDALONE=1 +#PEGASUS=1 +STANDALONE=1 # *********** SNIA CIMOM flavor ************* # @@ -75,12 +75,17 @@ endif ifdef STANDALONE +# cope with lib64 in .spec file +ifndef LIBDIR +LIBDIR=lib +endif + CIMOMINC=$(INSTALL_ROOT)/usr/include/cmpi -CIMOMLIB=$(INSTALL_ROOT)/usr/lib/cmpi +CIMOMLIB=$(INSTALL_ROOT)/usr/$(LIBDIR)/cmpi CIMOMMOF=$(INSTALL_ROOT)/usr/share/cmpi/mof COMMONINC=$(CIMOMINC) -COMMONLIB=$(INSTALL_ROOT)/usr/lib +COMMONLIB=$(INSTALL_ROOT)/usr/$(LIBDIR) MOFMAKEFILE=makefile.standalone Index: rules =================================================================== --- rules.orig +++ rules @@ -2,7 +2,7 @@ %.d: %.c $(RM) $@ - $(CC) -M $(CPPFLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@ + $(CC) -M $(CPPFLAGS) $(RPM_OPT_FLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@ lib%.so: %.o $(LINK.c) -shared $^ $(LOADLIBES) $(LDLIBS)-o $@
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor