libopenlmi: minor fixes and improvements

8 files changed, 18 insertions, 18 deletions

diff --git a/src/account/LMI_AccountCapabilitiesProvider.c b/src/account/LMI_AccountCapabilitiesProvider.c
index 0aea405..9ea80c0 100644
--- a/src/account/LMI_AccountCapabilitiesProvider.c
+++ b/src/account/LMI_AccountCapabilitiesProvider.c
@@ -75,7 +75,7 @@ static CMPIStatus LMI_AccountCapabilitiesEnumInstances(
 
     size_t i;
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     LMI_EnabledAccountCapabilitiesRef_Init(&leacref, _cb, nameSpace);
     LMI_EnabledAccountCapabilitiesRef_Set_InstanceID(&leacref,
@@ -96,7 +96,7 @@ static CMPIStatus LMI_AccountCapabilitiesEnumInstances(
         LMI_AccountRef_Init(&laref, _cb, nameSpace);
         LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
         LMI_AccountRef_Set_SystemCreationClassName(&laref,
-          get_system_creation_class_name());
+          lmi_get_system_creation_class_name());
         LMI_AccountRef_Set_SystemName(&laref, hostname);
         LMI_AccountRef_Set_CreationClassName(&laref,
           LMI_Account_ClassName);
diff --git a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
index 84a0921..b41949a 100644
--- a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
+++ b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
@@ -63,12 +63,12 @@ static CMPIStatus LMI_AccountManagementServiceCapabilitiesEnumInstances(
     LMI_AccountManagementServiceCapabilities lamsc;
 
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
     LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
     LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
-      get_system_creation_class_name());
+      lmi_get_system_creation_class_name());
     LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
     LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
       LMI_AccountManagementService_ClassName);
diff --git a/src/account/LMI_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c
index e0e6f89..652cd3a 100644
--- a/src/account/LMI_AccountManagementServiceProvider.c
+++ b/src/account/LMI_AccountManagementServiceProvider.c
@@ -88,7 +88,7 @@ static CMPIStatus LMI_AccountManagementServiceEnumInstances(
 {
     LMI_AccountManagementService lams;
 
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     LMI_AccountManagementService_Init(&lams, _cb, KNameSpace(cop));
     LMI_AccountManagementService_Set_CreationClassName(&lams,
@@ -97,7 +97,7 @@ static CMPIStatus LMI_AccountManagementServiceEnumInstances(
     LMI_AccountManagementService_Set_Name(&lams, LAMSNAME);
     LMI_AccountManagementService_Set_ElementName(&lams, LAMSNAME);
     LMI_AccountManagementService_Set_SystemCreationClassName(&lams,
-      get_system_creation_class_name());
+      lmi_get_system_creation_class_name());
     LMI_AccountManagementService_Set_RequestedState(&lams,
       LMI_AccountManagementService_RequestedState_Not_Applicable);
     LMI_AccountManagementService_Set_EnabledState(&lams,
@@ -402,7 +402,7 @@ KUint32 LMI_AccountManagementService_CreateAccount(
 
     const char *nameSpace = LMI_AccountManagementServiceRef_NameSpace(
         (LMI_AccountManagementServiceRef *) self);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
     CMPIStatus st;
     CMPIEnumeration *instances = NULL;
     LMI_AccountRef Accountref;
@@ -578,7 +578,7 @@ output:
       LMI_AccountRef_Set_Name(&Accountref, Name->chars);
       LMI_AccountRef_Set_SystemName(&Accountref, hostname);
       LMI_AccountRef_Set_SystemCreationClassName(&Accountref,
-        get_system_creation_class_name());
+        lmi_get_system_creation_class_name());
       LMI_AccountRef_Set_CreationClassName(&Accountref, LMI_Account_ClassName);
       AccountOP = LMI_AccountRef_ToObjectPath(&Accountref, &st);
       KRef_SetObjectPath(Account, AccountOP);
diff --git a/src/account/LMI_AccountOnSystemProvider.c b/src/account/LMI_AccountOnSystemProvider.c
index 9c5960b..879d969 100644
--- a/src/account/LMI_AccountOnSystemProvider.c
+++ b/src/account/LMI_AccountOnSystemProvider.c
@@ -74,7 +74,7 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances(
 
     size_t i;
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
     if (!luc)
@@ -89,7 +89,7 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances(
         lue = g_ptr_array_index(accounts, i);
 
         LMI_AccountRef_Init(&laref, _cb, nameSpace);
-        LMI_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
+        LMI_AccountRef_Set_SystemCreationClassName(&laref, lmi_get_system_creation_class_name());
         LMI_AccountRef_Set_SystemName(&laref, hostname);
         LMI_AccountRef_Set_CreationClassName(&laref,
           LMI_Account_ClassName);
diff --git a/src/account/LMI_AccountProvider.c b/src/account/LMI_AccountProvider.c
index fcfde9e..fdb06ff 100644
--- a/src/account/LMI_AccountProvider.c
+++ b/src/account/LMI_AccountProvider.c
@@ -110,7 +110,7 @@ static CMPIStatus LMI_AccountEnumInstances(
 
     size_t i;
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
     char *uid = NULL;
     long last_change, min_lifetime, max_lifetime, warn, inactive, expire;
     time_t last_login;
@@ -132,7 +132,7 @@ static CMPIStatus LMI_AccountEnumInstances(
         LMI_Account_Init(&la, _cb, nameSpace);
         LMI_Account_Set_CreationClassName(&la, LMI_Account_ClassName);
         LMI_Account_Set_SystemName(&la, hostname);
-        LMI_Account_Set_SystemCreationClassName(&la, get_system_creation_class_name());
+        LMI_Account_Set_SystemCreationClassName(&la, lmi_get_system_creation_class_name());
         LMI_Account_Set_Name(&la, aux_lu_get_str(lue, LU_USERNAME));
 
         LMI_Account_Init_OrganizationName(&la, 1); /* XXX */
diff --git a/src/account/LMI_AssignedAccountIdentityProvider.c b/src/account/LMI_AssignedAccountIdentityProvider.c
index 80a8915..4d94c9b 100644
--- a/src/account/LMI_AssignedAccountIdentityProvider.c
+++ b/src/account/LMI_AssignedAccountIdentityProvider.c
@@ -73,7 +73,7 @@ static CMPIStatus LMI_AssignedAccountIdentityEnumInstances(
 
     size_t i;
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
     char *uid = NULL;
 
     luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
@@ -95,7 +95,7 @@ static CMPIStatus LMI_AssignedAccountIdentityEnumInstances(
         LMI_AccountRef_Init(&laref, _cb, nameSpace);
         LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
         LMI_AccountRef_Set_SystemName(&laref, hostname);
-        LMI_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
+        LMI_AccountRef_Set_SystemCreationClassName(&laref, lmi_get_system_creation_class_name());
         LMI_AccountRef_Set_CreationClassName(&laref, LMI_Account_ClassName);
 
         LMI_AssignedAccountIdentity_Init(&laai, _cb, nameSpace);
diff --git a/src/account/LMI_HostedAccountManagementServiceProvider.c b/src/account/LMI_HostedAccountManagementServiceProvider.c
index 89fdcf3..ffe9b8e 100644
--- a/src/account/LMI_HostedAccountManagementServiceProvider.c
+++ b/src/account/LMI_HostedAccountManagementServiceProvider.c
@@ -62,12 +62,12 @@ static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances(
     LMI_HostedAccountManagementService lhs;
 
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
     LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
     LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
-      get_system_creation_class_name());
+      lmi_get_system_creation_class_name());
     LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
     LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
       LMI_AccountManagementService_ClassName);
diff --git a/src/account/LMI_ServiceAffectsIdentityProvider.c b/src/account/LMI_ServiceAffectsIdentityProvider.c
index 5d302a2..2cee1f7 100644
--- a/src/account/LMI_ServiceAffectsIdentityProvider.c
+++ b/src/account/LMI_ServiceAffectsIdentityProvider.c
@@ -74,12 +74,12 @@ static CMPIStatus LMI_ServiceAffectsIdentityEnumInstances(
     char *id = NULL;
 
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
+    const char *hostname = lmi_get_system_name();
 
     LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
     LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
     LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
-      get_system_creation_class_name());
+      lmi_get_system_creation_class_name());
     LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
     LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
       LMI_AccountManagementService_ClassName);