1 files changed, 20 insertions, 20 deletions

diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c
index 9c2a2db..4ada3f5 100644
--- a/src/logicalfile/LMI_RootDirectoryProvider.c
+++ b/src/logicalfile/LMI_RootDirectoryProvider.c
@@ -41,25 +41,25 @@ static CMPIStatus associators(
     CMPIStatus st;
     const char *ns = KNameSpace(cop);
     const char *comp_ccname = get_system_creation_class_name();
-    const char *path = get_string_property_from_op(cop, "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 = check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
-    check_class_check_status(st);
+    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
+    lmi_check_class_check_status(st);
 
     st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname);
-    check_status(st);
+    lmi_check_status(st);
 
     if (CMClassPathIsA(_cb, cop, LMI_UnixDirectory_ClassName, &st)) {
         /* got LMI_UnixDirectory - PartComponent */
-        st = check_assoc_class(_cb, ns, resultClass, comp_ccname);
-        check_class_check_status(st);
-        if (role && strcmp(role, PART_COMPONENT) != 0) {
+        st = lmi_check_assoc_class(_cb, ns, resultClass, comp_ccname);
+        lmi_check_class_check_status(st);
+        if (role && strcmp(role, LMI_PART_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        if (resultRole && strcmp(resultRole, GROUP_COMPONENT) != 0) {
+        if (resultRole && strcmp(resultRole, LMI_GROUP_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
         /* ignore this association if the directory is not root */
@@ -75,12 +75,12 @@ static CMPIStatus associators(
         }
     } else if (CMClassPathIsA(_cb, cop, systemname, &st)) {
         /* got CIM_ComputerSystem - GroupComponent */
-        st = check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName);
-        check_class_check_status(st);
-        if (role && strcmp(role, GROUP_COMPONENT) != 0) {
+        st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName);
+        lmi_check_class_check_status(st);
+        if (role && strcmp(role, LMI_GROUP_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        if (resultRole && strcmp(resultRole, PART_COMPONENT) != 0) {
+        if (resultRole && strcmp(resultRole, LMI_PART_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
 
@@ -117,24 +117,24 @@ static CMPIStatus references(
     CMPIInstance *ci;
     CMPIStatus st;
     const char *ns = KNameSpace(cop);
-    const char *path = get_string_property_from_op(cop, "Name");
+    const char *path = lmi_get_string_property_from_objectpath(cop, "Name");
     char ccname[BUFLEN];
     get_class_from_path(path, ccname);
     const char *systemname = lmi_get_system_creation_class_name();
 
-    st = check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
-    check_class_check_status(st);
+    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName);
+    lmi_check_class_check_status(st);
 
     char *fsname = NULL;
     char *fsclassname = NULL;
     st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname);
-    check_status(st);
+    lmi_check_status(st);
 
     LMI_RootDirectory_Init(&lmi_rd, _cb, ns);
 
     if (strcmp(ccname, LMI_UnixDirectory_ClassName) == 0) {
         /* got UnixDirectory - PartComponent */
-        if (role && strcmp(role, PART_COMPONENT) != 0) {
+        if (role && strcmp(role, LMI_PART_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
         /* ignore this association if the directory is not root */
@@ -142,14 +142,14 @@ static CMPIStatus references(
             CMReturn(CMPI_RC_OK);
         }
         st = lmi_check_required(_cb, cc, cop);
-        check_status(st);
+        lmi_check_status(st);
         LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, cop);
 
         LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd,
                 lmi_get_computer_system());
     } else if (CMClassPathIsA(_cb, cop, systemname, &st)) {
         /* got CIM_ComputerSystem - GroupComponent */
-        if (role && strcmp(role, GROUP_COMPONENT) != 0) {
+        if (role && strcmp(role, LMI_GROUP_COMPONENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
         LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, cop);
@@ -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);
-    check_status(st);
+    lmi_check_status(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);