faubackup2/src/network network_com.cpp,1.1.1.1,1.2 network_receiver.cpp,1.1.1.1,1.2 network_sender.cpp,1.1.1.1,1.2

Update of /cvsroot/faubackup/faubackup2/src/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24168/src/network

Modified Files:
	network_com.cpp network_receiver.cpp network_sender.cpp 
Log Message:
corrected code to prevent "shadow member" warnings


Index: network_sender.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_sender.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** network_sender.cpp	2 Jun 2005 09:31:13 -0000	1.1.1.1
--- network_sender.cpp	6 Jun 2005 12:56:20 -0000	1.2
***************
*** 16,23 ****
  {
  
! NetworkSender::NetworkSender(int fd)
  {
  
! 	this->fd = fd;
  	die_on_end = false;
  	active = true;
--- 16,23 ----
  {
  
! NetworkSender::NetworkSender(int newfd)
  {
  
! 	this->fd = newfd;
  	die_on_end = false;
  	active = true;
***************
*** 84,89 ****
  		pthread_mutex_unlock( &sender_network_mutex);
  
! 	}
! 	else
  		if(clientNo == 2) {
  			pthread_mutex_lock( &sender_client2_mutex);
--- 84,88 ----
  		pthread_mutex_unlock( &sender_network_mutex);
  
! 	} else
  		if(clientNo == 2) {
  			pthread_mutex_lock( &sender_client2_mutex);
***************
*** 97,102 ****
  			pthread_cond_signal( &sender_network_cond);
  			pthread_mutex_unlock( &sender_network_mutex);
! 		}
! 		else
  			output.critical("unknown receiver adressed", 0);
  	//output.information("sento" + int2string(queue_client1.size()) + " " + int2string(queue_client2.size()), EXCESSIV_DEBUG_OUTPUT);
--- 96,100 ----
  			pthread_cond_signal( &sender_network_cond);
  			pthread_mutex_unlock( &sender_network_mutex);
! 		} else
  			output.critical("unknown receiver adressed", 0);
  	//output.information("sento" + int2string(queue_client1.size()) + " " + int2string(queue_client2.size()), EXCESSIV_DEBUG_OUTPUT);

Index: network_com.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_com.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** network_com.cpp	2 Jun 2005 09:31:13 -0000	1.1.1.1
--- network_com.cpp	6 Jun 2005 12:56:20 -0000	1.2
***************
*** 19,28 ****
  {
  
! NetCommunication::NetCommunication(NetworkReceiver &in, NetworkSender &out, int source, int destination)
  {
  	net_in = ∈
  	net_out = &out;
! 	this->source= source;
! 	this->destination = destination;
  	eof = false;
  }
--- 19,28 ----
  {
  
! NetCommunication::NetCommunication(NetworkReceiver &in, NetworkSender &out, int src, int dest)
  {
  	net_in = ∈
  	net_out = &out;
! 	this->source= src;
! 	this->destination = dest;
  	eof = false;
  }

Index: network_receiver.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_receiver.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** network_receiver.cpp	2 Jun 2005 09:31:13 -0000	1.1.1.1
--- network_receiver.cpp	6 Jun 2005 12:56:20 -0000	1.2
***************
*** 19,25 ****
  
  
! NetworkReceiver::NetworkReceiver(int fd)
  {
! 	this->fd = fd;
  	total=0;
  	thread.start(*this, &NetworkReceiver::work);
--- 19,25 ----
  
  
! NetworkReceiver::NetworkReceiver(int newfd)
  {
! 	fd = newfd;
  	total=0;
  	thread.start(*this, &NetworkReceiver::work);



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20