From 28aed3c2c360b84762f76b322e9fc80bd74c036b Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 9 May 2014 17:37:40 +0200 Subject: Hardware: spring cleanup & refactor * use openlmi common library where possible * get rid of LMI_Hardware.h file * some other cosmetic changes --- src/hardware/LMI_PortPhysicalConnectorProvider.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/hardware/LMI_PortPhysicalConnectorProvider.c') diff --git a/src/hardware/LMI_PortPhysicalConnectorProvider.c b/src/hardware/LMI_PortPhysicalConnectorProvider.c index 9f2cac2..b2bf58d 100644 --- a/src/hardware/LMI_PortPhysicalConnectorProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PortPhysicalConnector.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_connectorlayout(const char *dmi_val); @@ -60,7 +60,7 @@ static CMPIStatus LMI_PortPhysicalConnectorEnumInstances( LMI_PortPhysicalConnector lmi_port; const char *ns = KNameSpace(cop); CMPIUint16 conn_layout; - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiPort *dmi_ports = NULL; unsigned dmi_ports_nb = 0; @@ -73,13 +73,13 @@ static CMPIStatus LMI_PortPhysicalConnectorEnumInstances( LMI_PortPhysicalConnector_Init(&lmi_port, _cb, ns); LMI_PortPhysicalConnector_Set_CreationClassName(&lmi_port, - LMI_ORGID "_" PORT_PHYS_CONN_CLASS_NAME); + LMI_PortPhysicalConnector_ClassName); LMI_PortPhysicalConnector_Set_Caption(&lmi_port, "Physical Port"); LMI_PortPhysicalConnector_Set_Description(&lmi_port, "This object represents one physical port on the chassis."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" PORT_PHYS_CONN_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PortPhysicalConnector_ClassName ":%s", dmi_ports[i].name); conn_layout = get_connectorlayout(dmi_ports[i].type); -- cgit