1 files changed, 14 insertions, 14 deletions

diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c
index 4ada3f5..501638f 100644
--- a/src/logicalfile/LMI_RootDirectoryProvider.c
+++ b/src/logicalfile/LMI_RootDirectoryProvider.c
@@ -40,22 +40,22 @@ static CMPIStatus associators(
     CMPIInstance *ci;
     CMPIStatus st;
     const char *ns = KNameSpace(cop);
-    const char *comp_ccname = get_system_creation_class_name();
+    const char *comp_ccname = lmi_get_system_creation_class_name();
     const char *path = lmi_get_string_property_from_objectpath(cop, "Name");
     char *fsname = NULL;
     char *fsclassname = NULL;
     const char *systemname = lmi_get_system_creation_class_name();
 
-    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
-    lmi_check_class_check_status(st);
+    st = lmi_class_path_is_a(_cb, ns, LMI_RootDirectory_ClassName, assocClass);
+    lmi_return_if_class_check_not_ok(st);
 
     st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname);
-    lmi_check_status(st);
+    lmi_return_if_status_not_ok(st);
 
     if (CMClassPathIsA(_cb, cop, LMI_UnixDirectory_ClassName, &st)) {
         /* got LMI_UnixDirectory - PartComponent */
-        st = lmi_check_assoc_class(_cb, ns, resultClass, comp_ccname);
-        lmi_check_class_check_status(st);
+        st = lmi_class_path_is_a(_cb, ns, comp_ccname, resultClass);
+        lmi_return_if_class_check_not_ok(st);
         if (role && strcmp(role, LMI_PART_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
@@ -75,8 +75,8 @@ static CMPIStatus associators(
         }
     } else if (CMClassPathIsA(_cb, cop, systemname, &st)) {
         /* got CIM_ComputerSystem - GroupComponent */
-        st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName);
-        lmi_check_class_check_status(st);
+        st = lmi_class_path_is_a(_cb, ns, LMI_UnixDirectory_ClassName, resultClass);
+        lmi_return_if_class_check_not_ok(st);
         if (role && strcmp(role, LMI_GROUP_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
@@ -122,13 +122,13 @@ static CMPIStatus references(
     get_class_from_path(path, ccname);
     const char *systemname = lmi_get_system_creation_class_name();
 
-    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
-    lmi_check_class_check_status(st);
+    st = lmi_class_path_is_a(_cb, ns, LMI_RootDirectory_ClassName, assocClass);
+    lmi_return_if_class_check_not_ok(st);
 
     char *fsname = NULL;
     char *fsclassname = NULL;
     st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname);
-    lmi_check_status(st);
+    lmi_return_if_status_not_ok(st);
 
     LMI_RootDirectory_Init(&lmi_rd, _cb, ns);
 
@@ -141,8 +141,8 @@ static CMPIStatus references(
         if (strcmp(path, "/") != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        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);
         LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, cop);
 
         LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd,
@@ -218,7 +218,7 @@ static CMPIStatus LMI_RootDirectoryEnumInstances(
     LMI_UnixDirectory lmi_ud;
     LMI_UnixDirectory_Init(&lmi_ud, _cb, ns);
     st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname);
-    lmi_check_status(st);
+    lmi_return_if_status_not_ok(st);
     fill_logicalfile(LMI_UnixDirectory, &lmi_ud, "/", fsclassname, fsname, LMI_UnixDirectory_ClassName);
     o = LMI_UnixDirectory_ToObjectPath(&lmi_ud, NULL);
     LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, o);