libopenlmi: reorganize and gather

Make naming consistent. Gather common functionality into one library and
try to use it across all providers.

Introduce libtool-style versioning for libraries.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c
index 82010b8..b1a8599 100644
--- a/src/logicalfile/LMI_FileIdentityProvider.c
+++ b/src/logicalfile/LMI_FileIdentityProvider.c
@@ -48,25 +48,25 @@ static CMPIStatus associators(
     char *fsname = NULL;
     char *fsclassname = NULL;
 
-    st = check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
-    check_class_check_status(st);
+    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
+    lmi_check_class_check_status(st);
 
     if (CMClassPathIsA(_cb, cop, LMI_UnixFile_ClassName, &st)) {
         /* got UnixFile - SameElement */
         st = lmi_check_required(_cb, cc, cop);
-        check_status(st);
+        lmi_check_status(st);
 
-        path = get_string_property_from_op(cop, "LFName");
+        path = lmi_get_string_property_from_objectpath(cop, "LFName");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        check_status(st);
+        lmi_check_status(st);
 
-        st = check_assoc_class(_cb, ns, resultClass, fileclass);
-        check_class_check_status(st);
-        if (role && strcmp(role, SAME_ELEMENT) != 0) {
+        st = lmi_check_assoc_class(_cb, ns, resultClass, fileclass);
+        lmi_check_class_check_status(st);
+        if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        if (resultRole && strcmp(resultRole, SYSTEM_ELEMENT) != 0) {
+        if (resultRole && strcmp(resultRole, LMI_SYSTEM_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
 
@@ -78,22 +78,22 @@ static CMPIStatus associators(
     } else if (CMClassPathIsA(_cb, cop, CIM_LogicalFile_ClassName, &st)) {
         /* got LogicalFile - SystemElement */
         st = lmi_check_required(_cb, cc, cop);
-        check_status(st);
+        lmi_check_status(st);
 
-        path = get_string_property_from_op(cop, "Name");
+        path = lmi_get_string_property_from_objectpath(cop, "Name");
 
-        st = check_assoc_class(_cb, ns, resultClass, LMI_UnixFile_ClassName);
-        check_class_check_status(st);
-        if (role && strcmp(role, SYSTEM_ELEMENT) != 0) {
+        st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixFile_ClassName);
+        lmi_check_class_check_status(st);
+        if (role && strcmp(role, LMI_SYSTEM_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        if (resultRole && strcmp(resultRole, SAME_ELEMENT) != 0) {
+        if (resultRole && strcmp(resultRole, LMI_SAME_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
 
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        check_status(st);
+        lmi_check_status(st);
 
         LMI_UnixFile lmi_uf;
         LMI_UnixFile_Init(&lmi_uf, _cb, ns);
@@ -138,8 +138,8 @@ static CMPIStatus references(
     char *fsname = NULL;
     char *fsclassname = NULL;
 
-    st = check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
-    check_class_check_status(st);
+    st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName);
+    lmi_check_class_check_status(st);
 
     LMI_FileIdentity_Init(&lmi_fi, _cb, ns);
 
@@ -152,12 +152,12 @@ static CMPIStatus references(
             return st;
         }
 
-        path = get_string_property_from_op(cop, "LFName");
+        path = lmi_get_string_property_from_objectpath(cop, "LFName");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        check_status(st);
+        lmi_check_status(st);
 
-        if (role && strcmp(role, SAME_ELEMENT) != 0) {
+        if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
 
@@ -178,13 +178,13 @@ static CMPIStatus references(
             return st;
         }
 
-        if (role && strcmp(role, SYSTEM_ELEMENT) != 0) {
+        if (role && strcmp(role, LMI_SYSTEM_ELEMENT) != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        path = get_string_property_from_op(cop, "Name");
+        path = lmi_get_string_property_from_objectpath(cop, "Name");
         get_class_from_path(path, fileclass);
         st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname);
-        check_status(st);
+        lmi_check_status(st);
 
         /* SameElement */
         LMI_UnixFile lmi_uf;