[Libvirt-cim] [PATCH 15 of 18] Fixes to SettingsDefineState for libcmpiutil API change

[Dan Smith]

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1196195206 28800
# Node ID eeba8399b981b7539a8103fcf1a196e98476073b
# Parent  4036e27b892058dbe0ea944d74932554b53c2c67
Fixes to SettingsDefineState for libcmpiutil API change

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 4036e27b8920 -r eeba8399b981 src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c	Tue Nov 27 12:26:40 2007 -0800
+++ b/src/Virt_SettingsDefineState.c	Tue Nov 27 12:26:46 2007 -0800
@@ -46,7 +46,7 @@ static CMPIInstance *find_rasd(struct in
         CMPIInstance *inst;
 
         for (i = 0; i < list->cur; i++) {
-                char *id;
+                const char *id;
                 int ret;
 
                 inst = list->list[i];
@@ -55,12 +55,8 @@ static CMPIInstance *find_rasd(struct in
                 if (ret != CMPI_RC_OK)
                         continue;
 
-                if (STREQ(id, devid)) {
-                        free(id);
+                if (STREQ(id, devid))
                         return inst;
-                } else {
-                        free(id);
-                }
         }
 
         return NULL;
@@ -73,15 +69,14 @@ static CMPIStatus dev_to_rasd(const CMPI
         CMPIStatus s;
         CMPIInstance *rasd;
         struct inst_list rasds;
-        char *id = NULL;
+        const char *id = NULL;
         char *name = NULL;
         char *devid = NULL;
         int ret;
 
         inst_list_init(&rasds);
 
-        id = cu_get_str_path(ref, "DeviceID");
-        if (id == NULL) {
+        if (cu_get_str_path(ref, "DeviceID", &id) != CMPI_RC_OK) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Missing DeviceID");
@@ -109,14 +104,13 @@ static CMPIStatus dev_to_rasd(const CMPI
         CMSetStatus(&s, CMPI_RC_OK);
 
  out:
-        free(id);
         free(name);
         free(devid);
 
         return s;
 }
 
-static CMPIInstance *_get_typed_device(char *id,
+static CMPIInstance *_get_typed_device(const char *id,
                                        int type,
                                        const CMPIObjectPath *ref,
                                        CMPIStatus *s)
@@ -161,13 +155,12 @@ static CMPIStatus rasd_to_dev(const CMPI
 {
         CMPIStatus s;
         CMPIInstance *dev = NULL;
-        char *id = NULL;
+        const char *id = NULL;
         uint16_t type;
 
         ASSOC_MATCH(info->provider_name, CLASSNAME(ref));
 
-        id = cu_get_str_path(ref, "InstanceID");
-        if (id == NULL) {
+        if (cu_get_str_path(ref, "InstanceID", &id) != CMPI_RC_OK) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Missing InstanceID");
@@ -190,8 +183,6 @@ static CMPIStatus rasd_to_dev(const CMPI
         CMSetStatus(&s, CMPI_RC_OK);
 
  out:
-        free(id);
-
         return s;
 }
 
@@ -201,7 +192,7 @@ static CMPIStatus vs_to_vssd(const CMPIO
 {
         virConnectPtr conn = NULL;
         virDomainPtr dom = NULL;
-        char *name;
+        const char *name;
         CMPIInstance *vssd;
         CMPIStatus s;
 
@@ -209,8 +200,7 @@ static CMPIStatus vs_to_vssd(const CMPIO
         if (conn == NULL)
                 return s;
 
-        name = cu_get_str_path(ref, "Name");
-        if (name == NULL) {
+        if (cu_get_str_path(ref, "Name", &name) != CMPI_RC_OK) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Missing Name property");
@@ -232,7 +222,6 @@ static CMPIStatus vs_to_vssd(const CMPIO
         CMSetStatus(&s, CMPI_RC_OK);
 
  out:
-        free(name);
         virDomainFree(dom);
         virConnectClose(conn);
 
@@ -244,7 +233,7 @@ static CMPIStatus vssd_to_vs(const CMPIO
                              struct std_assoc_info *info,
                              struct inst_list *list)
 {
-        char *id = NULL;
+        const char *id = NULL;
         char *pfx = NULL;
         char *name = NULL;
         int ret;
@@ -252,8 +241,7 @@ static CMPIStatus vssd_to_vs(const CMPIO
         CMPIStatus s;
         CMPIInstance *cs;
 
-        id = cu_get_str_path(ref, "InstanceID");
-        if (id == NULL) {
+        if (cu_get_str_path(ref, "InstanceID", &id) != CMPI_RC_OK) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Missing InstanceID");
@@ -284,7 +272,6 @@ static CMPIStatus vssd_to_vs(const CMPIO
  out:
         free(name);
         free(pfx);
-        free(id);
 
         virConnectClose(conn);