[PATCH] [CU] Add set_int_property() function to EO parse
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1204130653 28800 # Node ID 64e51763141e107bc89710897ea9dc9c2fc08dbc # Parent e5931f33c94eb4895a359538b53cd1a1d075bb53 [CU] Add set_int_property() function to EO parse. This function attempts to find the appropriate property value type and then sets that property value. This change is needed to properly parse non 64 bit integer. If the property is a uint16 value, and CMPI_uint64 is passed CMSetProperty(), the call will fail. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r e5931f33c94e -r 64e51763141e eo_parser.c --- a/eo_parser.c Thu Feb 21 07:44:01 2008 -0800 +++ b/eo_parser.c Wed Feb 27 08:44:13 2008 -0800 @@ -107,6 +107,62 @@ int cu_parse_embedded_instance(const cha } } +static int _set_int_prop(CMPISint64 value, + char *prop, + CMPIType type, + CMPIInstance *inst) +{ + CMPIStatus s; + uint64_t unsigned_val = 0; + int64_t signed_val = 0; + + switch(type) { + case CMPI_uint64: + case CMPI_uint32: + case CMPI_uint16: + case CMPI_uint8: + unsigned_val = value; + s = CMSetProperty(inst, prop, &(unsigned_val), type); + break; + case CMPI_sint64: + case CMPI_sint32: + case CMPI_sint16: + case CMPI_sint8: + default: + signed_val = value; + s = CMSetProperty(inst, prop, &(signed_val), type); + } + + if (s.rc == CMPI_RC_OK) + return 1; + + return 0; +} + +CMPIType set_int_prop(CMPISint64 value, + char *prop, + CMPIInstance *inst) +{ + if (_set_int_prop(value, prop, CMPI_uint64, inst) == 1) + return CMPI_uint64; + else if (_set_int_prop(value, prop, CMPI_uint32, inst) == 1) + return CMPI_uint32; + else if (_set_int_prop(value, prop, CMPI_uint16, inst) == 1) + return CMPI_uint16; + else if (_set_int_prop(value, prop, CMPI_uint8, inst) == 1) + return CMPI_uint8; + else if (_set_int_prop(value, prop, CMPI_sint64, inst) == 1) + return CMPI_sint64; + else if (_set_int_prop(value, prop, CMPI_sint32, inst) == 1) + return CMPI_sint32; + else if (_set_int_prop(value, prop, CMPI_sint16, inst) == 1) + return CMPI_sint16; + else + _set_int_prop(value, prop, CMPI_sint8, inst); + + return CMPI_sint8; +} + /* * Local Variables: * mode: C diff -r e5931f33c94e -r 64e51763141e eo_parser_xml.h --- a/eo_parser_xml.h Thu Feb 21 07:44:01 2008 -0800 +++ b/eo_parser_xml.h Wed Feb 27 08:44:13 2008 -0800 @@ -27,6 +27,10 @@ int cu_parse_ei_xml(const CMPIBroker *br const char *xml, CMPIInstance **instance); +CMPIType set_int_prop(CMPISint64 value, + char *prop, + CMPIInstance *inst); + #endif /* diff -r e5931f33c94e -r 64e51763141e eo_util_parser.y --- a/eo_util_parser.y Thu Feb 21 07:44:01 2008 -0800 +++ b/eo_util_parser.y Wed Feb 27 08:44:13 2008 -0800 @@ -10,9 +10,12 @@ %{ #include <stdlib.h> #include <stdio.h> +#include <stdint.h> #include "cmpidt.h" #include "cmpift.h" + +#include "eo_parser_xml.h" /* specify prototypes to get rid of warnings */ int eo_parse_lex (void); @@ -103,12 +106,12 @@ property: PROPERTYNAME '=' STRING ';' | PROPERTYNAME '=' INTEGER ';' { - EOTRACE("propertyname = %s" - "\ttype = CMPI_sint64\n" - "\tvalue = %lld\n", - $1, $3); - unsigned long long value = $3; - CMSetProperty(*_INSTANCE, $1, &(value), CMPI_uint64); + EOTRACE("propertyname = %s\n", $1); + int rc; + //uint64_t value = $3; + CMPIType t = set_int_prop($3, $1, *_INSTANCE); + EOTRACE("\ttype = %d\n" + "\tvalue = %lld\n", t, $3); free($1); }
KR> + unsigned_val = value; I think you should cast this explicitly to avoid a warning in the future. We have to compile without strict warnings because the generated parser code is riddled with issues, but I think we should try to make a routine such as this one as clean as possible. KR> + s = CMSetProperty(inst, prop, &(unsigned_val), type); Don't you want a (CMPIValue *) cast in front of your &(unsigned_val)? KR> + EOTRACE("propertyname = %s\n", $1); KR> + int rc; KR> + //uint64_t value = $3; KR> + CMPIType t = set_int_prop($3, $1, *_INSTANCE); I think you've got some whitespace issues here, and I think we can remove the commented-out code, right? -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
Dan Smith wrote:
KR> + unsigned_val = value;
I think you should cast this explicitly to avoid a warning in the future. We have to compile without strict warnings because the generated parser code is riddled with issues, but I think we should try to make a routine such as this one as clean as possible.
Good catch =)
KR> + s = CMSetProperty(inst, prop, &(unsigned_val), type);
Don't you want a (CMPIValue *) cast in front of your &(unsigned_val)?
I think you can leave this off for integer types - it seems to work both with and without. The original call in eo_util_parse.y didn't have it. But I need to resend, so I'll add it for consistency =)
KR> + EOTRACE("propertyname = %s\n", $1); KR> + int rc; KR> + //uint64_t value = $3; KR> + CMPIType t = set_int_prop($3, $1, *_INSTANCE);
I think you've got some whitespace issues here, and I think we can remove the commented-out code, right?
Oops - I though I'd gone back and removed the commented out code. Sending updated patch =) -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
KR> I think you can leave this off for integer types - it seems to KR> work both with and without. The original call in eo_util_parse.y KR> didn't have it. But I need to resend, so I'll add it for KR> consistency =) No, it works in the original code because we don't have -Winsane and -Werror turned on for the EO parser stuff. The rest of the code is so bad that it wouldn't compile otherwise. -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
participants (2)
-
Dan Smith -
Kaitlin Rupert