[Spread-cvs] commit: r859 - in branches/spread_5/libspread-util: include src

[jschultz at spread.org]

Author: jschultz
Date: 2016-11-03 10:51:42 -0400 (Thu, 03 Nov 2016)
New Revision: 859

Modified:
   branches/spread_5/libspread-util/include/spu_addr.h
   branches/spread_5/libspread-util/src/data_link.c
   branches/spread_5/libspread-util/src/spu_addr.c
Log:
Added SPU_ADDR_NTOP2 macro and eliminated an unused variable in data_link.c



Modified: branches/spread_5/libspread-util/include/spu_addr.h
===================================================================
--- branches/spread_5/libspread-util/include/spu_addr.h	2016-10-18 15:49:50 UTC (rev 858)
+++ branches/spread_5/libspread-util/include/spu_addr.h	2016-11-03 14:51:42 UTC (rev 859)
@@ -54,10 +54,14 @@
 
 /* NOTE: these macros return the same global buffer, so you typically can't call this fcn multiple times in a single statement (e.g. - in a fcn parameter list) */
 
-#define SPU_ADDR_NTOP(a)       (spu_addr_ntop_r((a),       Spu_addr_ntop_buf, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf)
-#define SPU_ADDR_NTOP_CANON(a) (spu_addr_ntop_canon_r((a), Spu_addr_ntop_buf, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf)
+#define SPU_ADDR_NTOP(a)        (spu_addr_ntop_r((a),       Spu_addr_ntop_buf, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf)
+#define SPU_ADDR_NTOP_CANON(a)  (spu_addr_ntop_canon_r((a), Spu_addr_ntop_buf, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf)
 
+#define SPU_ADDR_NTOP2(a)       (spu_addr_ntop_r((a),       Spu_addr_ntop_buf2, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf2)
+#define SPU_ADDR_NTOP_CANON2(a) (spu_addr_ntop_canon_r((a), Spu_addr_ntop_buf2, SPU_ADDR_STRSIZE) ? "address conversion failed" : Spu_addr_ntop_buf2)
+
 extern char Spu_addr_ntop_buf[SPU_ADDR_STRSIZE];
+extern char Spu_addr_ntop_buf2[SPU_ADDR_STRSIZE];
 
 typedef union
 {

Modified: branches/spread_5/libspread-util/src/data_link.c
===================================================================
--- branches/spread_5/libspread-util/src/data_link.c	2016-10-18 15:49:50 UTC (rev 858)
+++ branches/spread_5/libspread-util/src/data_link.c	2016-11-03 14:51:42 UTC (rev 859)
@@ -287,7 +287,6 @@
 {
   int ret = -1;
   int family;
-  int tmp;
 
   if (mcast_addr == NULL)
   {

Modified: branches/spread_5/libspread-util/src/spu_addr.c
===================================================================
--- branches/spread_5/libspread-util/src/spu_addr.c	2016-10-18 15:49:50 UTC (rev 858)
+++ branches/spread_5/libspread-util/src/spu_addr.c	2016-11-03 14:51:42 UTC (rev 859)
@@ -65,6 +65,7 @@
  ********************************************************************************/
 
 char Spu_addr_ntop_buf[SPU_ADDR_STRSIZE];
+char Spu_addr_ntop_buf2[SPU_ADDR_STRSIZE];
 
 /********************************************************************************
  ********************************************************************************/