From 9e32cb9b602903ac14f223b8a7a530a89f4e28dc Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 18 Jun 2014 15:19:36 +0000
Subject: [PATCH] usnic: move some defines into btl_usnic_util.h

Move MACLEN and IPV4LEN into _util.h and rename them to be MACSTRLEN
and IPV4STRLEN, respectively.

cmr=v1.8.2:ticket=trac:4734

This commit was SVN r32028.

The following Trac tickets were found above:
  Ticket 4734 --> https://svn.open-mpi.org/trac/ompi/ticket/4734
---
 ompi/mca/btl/usnic/btl_usnic_cagent.c | 20 +++++---------------
 ompi/mca/btl/usnic/btl_usnic_util.h   | 10 ++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ompi/mca/btl/usnic/btl_usnic_cagent.c b/ompi/mca/btl/usnic/btl_usnic_cagent.c
index 4f381dc92c..6f4a64cda3 100644
--- a/ompi/mca/btl/usnic/btl_usnic_cagent.c
+++ b/ompi/mca/btl/usnic/btl_usnic_cagent.c
@@ -35,16 +35,6 @@
  * Agent data and methods
  **************************************************************************/
 
-/*
- * Long enough to hold "xxx.xxx.xxx.xxx/xx"
- */
-#define IPV4ADDRLEN 20
-
-/*
- * Long enough to hold "xx:xx:xx:xx:xx:xx"
- */
-#define MACLEN 18
-
 /*
  * Local variables
  */
@@ -72,12 +62,12 @@ typedef struct {
     /* Data from the LISTEN command message */
     uint32_t ipv4_addr;
     uint32_t cidrmask;
-    char ipv4_addr_str[IPV4ADDRLEN];
+    char ipv4_addr_str[IPV4STRADDRLEN];
     uint32_t mtu;
     char *nodename;
     char *if_name;
     char *usnic_name;
-    char mac_str[MACLEN];
+    char mac_str[MACSTRLEN];
 
     /* File descriptor, UDP port, buffer to receive messages, and event */
     int fd;
@@ -357,7 +347,7 @@ static void agent_thread_handle_ping(agent_udp_port_listener_t *listener,
         return;
     }
 
-    char src_ipv4_addr_str[IPV4ADDRLEN];
+    char src_ipv4_addr_str[IPV4STRADDRLEN];
     ompi_btl_usnic_snprintf_ipv4_addr(src_ipv4_addr_str,
                                       sizeof(src_ipv4_addr_str),
                                       msg->src_ipv4_addr, 0);
@@ -652,7 +642,7 @@ static void agent_thread_send_ping(int fd, short flags, void *context)
     agent_ping_t *ap = (agent_ping_t*) context;
     ap->timer_active = false;
 
-    char dest_ipv4_addr_str[IPV4ADDRLEN];
+    char dest_ipv4_addr_str[IPV4STRADDRLEN];
     ompi_btl_usnic_snprintf_ipv4_addr(dest_ipv4_addr_str,
                                       sizeof(dest_ipv4_addr_str),
                                       ap->dest_ipv4_addr, ap->dest_cidrmask);
@@ -697,7 +687,7 @@ static void agent_thread_send_ping(int fd, short flags, void *context)
             topic = "connectivity error: small bad, large bad";
         }
 
-        char mac_str[MACLEN], ipv4_addr_str[IPV4ADDRLEN];
+        char mac_str[MACSTRLEN], ipv4_addr_str[IPV4STRADDRLEN];
         ompi_btl_usnic_snprintf_ipv4_addr(ipv4_addr_str, sizeof(ipv4_addr_str),
                                           ap->dest_ipv4_addr,
                                           ap->dest_cidrmask);
diff --git a/ompi/mca/btl/usnic/btl_usnic_util.h b/ompi/mca/btl/usnic/btl_usnic_util.h
index e41c8267e5..bbb9891cf8 100644
--- a/ompi/mca/btl/usnic/btl_usnic_util.h
+++ b/ompi/mca/btl/usnic/btl_usnic_util.h
@@ -81,6 +81,16 @@ usnic_convertor_pack_simple(
  */
 void ompi_btl_usnic_exit(void);
 
+/*
+ * Long enough to hold "xxx.xxx.xxx.xxx/xx"
+ */
+#define IPV4STRADDRLEN 20
+
+/*
+ * Long enough to hold "xx:xx:xx:xx:xx:xx"
+ */
+#define MACSTRLEN 18
+
 /*
  * If cidrmask==0, it is not included in the output string.  addr is
  * expected to be in network byte order.