diff options
| author | Peter Schiffer <pschiffe@redhat.com> | 2014-05-09 17:37:40 +0200 |
|---|---|---|
| committer | Peter Schiffer <pschiffe@redhat.com> | 2014-05-12 19:20:43 +0200 |
| commit | 28aed3c2c360b84762f76b322e9fc80bd74c036b (patch) | |
| tree | 880f68596cbaf7e0e020a6f116c3e789cd4fd60a /src/hardware/LMI_BatteryProvider.c | |
| parent | 87a03ac7ebff779351e9782d40e691221195f8e0 (diff) | |
| download | openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.tar.gz openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.tar.xz openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.zip | |
Hardware: spring cleanup & refactor
* use openlmi common library where possible
* get rid of LMI_Hardware.h file
* some other cosmetic changes
Diffstat (limited to 'src/hardware/LMI_BatteryProvider.c')
| -rw-r--r-- | src/hardware/LMI_BatteryProvider.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/hardware/LMI_BatteryProvider.c b/src/hardware/LMI_BatteryProvider.c index 0907bbc..2037e86 100644 --- a/src/hardware/LMI_BatteryProvider.c +++ b/src/hardware/LMI_BatteryProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_Battery.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_chemistry(const char *dmi_val); @@ -59,7 +59,7 @@ static CMPIStatus LMI_BatteryEnumInstances( { LMI_Battery lmi_batt; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiBattery *dmi_batt = NULL; unsigned dmi_batt_nb = 0; @@ -75,7 +75,7 @@ static CMPIStatus LMI_BatteryEnumInstances( lmi_get_system_creation_class_name()); LMI_Battery_Set_SystemName(&lmi_batt, lmi_get_system_name()); LMI_Battery_Set_CreationClassName(&lmi_batt, - LMI_ORGID "_" BATTERY_CLASS_NAME); + LMI_Battery_ClassName); LMI_Battery_Set_BatteryStatus(&lmi_batt, LMI_Battery_BatteryStatus_Unknown); LMI_Battery_Init_OperationalStatus(&lmi_batt, 1); @@ -85,12 +85,12 @@ static CMPIStatus LMI_BatteryEnumInstances( LMI_Battery_HealthState_Unknown); LMI_Battery_Set_EnabledState(&lmi_batt, LMI_Battery_EnabledState_Unknown); - LMI_Battery_Set_Caption(&lmi_batt, BATTERY_CLASS_NAME); + LMI_Battery_Set_Caption(&lmi_batt, "Battery"); LMI_Battery_Set_Description(&lmi_batt, "This object represents one battery in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" BATTERY_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Battery_ClassName ":%s", dmi_batt[i].name); LMI_Battery_Set_DeviceID(&lmi_batt, dmi_batt[i].name); |