# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1196195114 28800
# Node ID fecc81fd400c780ecb496af2ed9ba17001ff2f05
# Parent 0bbb737215af97d0704bbbd6e2526f6aec839228
Changes to SettingsDefineCapabilities for libcmpiutil API change
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r 0bbb737215af -r fecc81fd400c src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Tue Nov 27 12:25:05 2007 -0800
+++ b/src/Virt_SettingsDefineCapabilities.c Tue Nov 27 12:25:14 2007 -0800
@@ -499,7 +499,7 @@ static struct sdc_rasd_prop *disk_max(co
CMPIStatus *s)
{
bool ret;
- char *inst_id;
+ const char *inst_id;
CMPIrc prop_ret;
uint16_t free_space;
uint64_t free_64;
@@ -507,8 +507,7 @@ static struct sdc_rasd_prop *disk_max(co
CMPIInstance *pool_inst;
struct sdc_rasd_prop *rasd = NULL;
- inst_id = cu_get_str_path(ref, "InstanceID");
- if (inst_id == NULL) {
+ if (cu_get_str_path(ref, "InstanceID", &inst_id) != CMPI_RC_OK) {
cu_statusf(_BROKER, s,
CMPI_RC_ERR_FAILED,
"Could not get InstanceID.");
@@ -558,7 +557,6 @@ static struct sdc_rasd_prop *disk_max(co
}
out:
- free(inst_id);
return rasd;
}