libopenlmi: minor fixes and improvements

1 files changed, 22 insertions, 22 deletions

diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c
index b1a8599..7811895 100644
--- a/src/logicalfile/LMI_FileIdentityProvider.c
+++ b/src/logicalfile/LMI_FileIdentityProvider.c
@@ -48,21 +48,21 @@ static CMPIStatus associators(
     char *fsname = NULL;
     char *fsclassname = NULL;
 
-    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
-    lmi_check_class_check_status(st);
+    st = lmi_class_path_is_a(_cb, ns, LMI_FileIdentity_ClassName, assocClass);
+    lmi_return_if_class_check_not_ok(st);
 
     if (CMClassPathIsA(_cb, cop, LMI_UnixFile_ClassName, &st)) {
         /* got UnixFile - SameElement */
-        st = lmi_check_required(_cb, cc, cop);
-        lmi_check_status(st);
+        st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName");
+        lmi_return_if_status_not_ok(st);
 
         path = lmi_get_string_property_from_objectpath(cop, "LFName");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        lmi_check_status(st);
+        lmi_return_if_status_not_ok(st);
 
-        st = lmi_check_assoc_class(_cb, ns, resultClass, fileclass);
-        lmi_check_class_check_status(st);
+        st = lmi_class_path_is_a(_cb, ns, fileclass, resultClass);
+        lmi_return_if_class_check_not_ok(st);
         if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
@@ -77,13 +77,13 @@ static CMPIStatus associators(
         CMSetClassName(o, fileclass);
     } else if (CMClassPathIsA(_cb, cop, CIM_LogicalFile_ClassName, &st)) {
         /* got LogicalFile - SystemElement */
-        st = lmi_check_required(_cb, cc, cop);
-        lmi_check_status(st);
+        st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName");
+        lmi_return_if_status_not_ok(st);
 
         path = lmi_get_string_property_from_objectpath(cop, "Name");
 
-        st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixFile_ClassName);
-        lmi_check_class_check_status(st);
+        st = lmi_class_path_is_a(_cb, ns, LMI_UnixFile_ClassName, resultClass);
+        lmi_return_if_class_check_not_ok(st);
         if (role && strcmp(role, LMI_SYSTEM_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
@@ -93,13 +93,13 @@ static CMPIStatus associators(
 
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        lmi_check_status(st);
+        lmi_return_if_status_not_ok(st);
 
         LMI_UnixFile lmi_uf;
         LMI_UnixFile_Init(&lmi_uf, _cb, ns);
         LMI_UnixFile_Set_LFName(&lmi_uf, path);
-        LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, get_system_creation_class_name());
-        LMI_UnixFile_Set_CSName(&lmi_uf, get_system_name());
+        LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, lmi_get_system_creation_class_name());
+        LMI_UnixFile_Set_CSName(&lmi_uf, lmi_get_system_name());
         LMI_UnixFile_Set_FSCreationClassName(&lmi_uf, fsclassname);
         LMI_UnixFile_Set_FSName(&lmi_uf, fsname);
         LMI_UnixFile_Set_LFCreationClassName(&lmi_uf, fileclass);
@@ -138,8 +138,8 @@ static CMPIStatus references(
     char *fsname = NULL;
     char *fsclassname = NULL;
 
-    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
-    lmi_check_class_check_status(st);
+    st = lmi_class_path_is_a(_cb, ns, LMI_FileIdentity_ClassName, assocClass);
+    lmi_return_if_class_check_not_ok(st);
 
     LMI_FileIdentity_Init(&lmi_fi, _cb, ns);
 
@@ -147,7 +147,7 @@ static CMPIStatus references(
         /* got UnixFile - SameElement */
         LMI_FileIdentity_SetObjectPath_SameElement(&lmi_fi, cop);
 
-        st = lmi_check_required(_cb, cc, cop);
+        st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName");
         if (st.rc != CMPI_RC_OK) {
             return st;
         }
@@ -155,7 +155,7 @@ static CMPIStatus references(
         path = lmi_get_string_property_from_objectpath(cop, "LFName");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        lmi_check_status(st);
+        lmi_return_if_status_not_ok(st);
 
         if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
@@ -173,7 +173,7 @@ static CMPIStatus references(
         /* got LogicalFile - SystemElement */
         LMI_FileIdentity_SetObjectPath_SystemElement(&lmi_fi, cop);
 
-        st = lmi_check_required(_cb, cc, cop);
+        st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName");
         if (st.rc != CMPI_RC_OK) {
             return st;
         }
@@ -184,14 +184,14 @@ static CMPIStatus references(
         path = lmi_get_string_property_from_objectpath(cop, "Name");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        lmi_check_status(st);
+        lmi_return_if_status_not_ok(st);
 
         /* SameElement */
         LMI_UnixFile lmi_uf;
         LMI_UnixFile_Init(&lmi_uf, _cb, ns);
         LMI_UnixFile_Set_LFName(&lmi_uf, path);
-        LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, get_system_creation_class_name());
-        LMI_UnixFile_Set_CSName(&lmi_uf, get_system_name());
+        LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, lmi_get_system_creation_class_name());
+        LMI_UnixFile_Set_CSName(&lmi_uf, lmi_get_system_name());
         LMI_UnixFile_Set_FSCreationClassName(&lmi_uf, fsclassname);
         LMI_UnixFile_Set_FSName(&lmi_uf, fsname);
         LMI_UnixFile_Set_LFCreationClassName(&lmi_uf, fileclass);