[PVFS2-CVS] commit by rbross in pvfs2/src/io/bmi/bmi_tcp: bmi-tcp-addressing.h bmi-tcp.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp
In directory parlweb:/tmp/cvs-serv32348/src/io/bmi/bmi_tcp

Modified Files:
	bmi-tcp-addressing.h bmi-tcp.c 
Log Message:
combo PVFS_id_gen_t -> PVFS_BMI_addr_t, formatting, PVFS error code patch.
Ugly.  Sorry if my formatting pisses someone off; at least I'm not using >
80 columns any more :).


Index: bmi-tcp-addressing.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp-addressing.h,v
diff -p -u -r1.6 -r1.7
--- bmi-tcp-addressing.h	12 Feb 2004 22:50:12 -0000	1.6
+++ bmi-tcp-addressing.h	16 Feb 2004 21:22:41 -0000	1.7
@@ -26,7 +26,7 @@ struct tcp_addr
 {
     method_addr_p map;		/* points back to generic address */
     /* stores error code for addresses that are broken for some reason */
-    int error_code;		
+    int addr_error;		
     char *hostname;
     char *ipaddr;
     bmi_port_t port;

Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.62 -r1.63
--- bmi-tcp.c	14 Feb 2004 23:20:40 -0000	1.62
+++ bmi-tcp.c	16 Feb 2004 21:22:41 -0000	1.63
@@ -1327,7 +1327,7 @@ void tcp_forget_addr(method_addr_p map,
 	BMI_socket_collection_remove(tcp_socket_collection_p, map);
     }
     tcp_cleanse_addr(map, error_code);
-    tcp_addr_data->error_code = error_code;
+    tcp_addr_data->addr_error = error_code;
     if (dealloc_flag)
     {
 	dealloc_tcp_method_addr(map);
@@ -1518,11 +1518,11 @@ static int tcp_sock_init(method_addr_p m
     {
 	return (-EINVAL);
     }
-    if(tcp_addr_data->error_code)
+    if(tcp_addr_data->addr_error)
     {
 	/* this address is bad, don't try to do anything with it */
 	gossip_err("Warning: BMI communication attempted on an address in failure mode.\n");
-	return(tcp_addr_data->error_code);
+	return(tcp_addr_data->addr_error);
     }
 
     /* is there already a socket? */
@@ -1769,11 +1769,11 @@ static int tcp_post_recv_generic(bmi_op_
     int i;
 
     tcp_addr_data = src->method_data;
-    if(tcp_addr_data->error_code)
+    if(tcp_addr_data->addr_error)
     {
 	/* this address is bad, don't try to do anything with it */
 	gossip_err("Warning: BMI communication attempted on an address in failure mode.\n");
-	return(tcp_addr_data->error_code);
+	return(tcp_addr_data->addr_error);
     }
 
     /* lets make sure that the message hasn't already been fully