faubackup2/src/common backup_control.cpp,1.3,1.4 registration.cpp,1.1.1.1,1.2 registration.hpp,1.1.1.1,1.2

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

Modified Files:
	backup_control.cpp registration.cpp registration.hpp 
Log Message:
removed unused multiplexer-code


Index: registration.hpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/common/registration.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** registration.hpp	2 Jun 2005 09:31:13 -0000	1.1.1.1
--- registration.hpp	6 Jun 2005 12:32:35 -0000	1.2
***************
*** 2,6 ****
  #define __Registration_include__
  #include "common/common.hpp"
- #include "network/multiplexer.hpp"
  #include <sys/types.h>
  
--- 2,5 ----
***************
*** 13,17 ****
  	void kill_process(pid_t pid);
  	int counter;
- 	Multiplexer *multiplexer_;
  
  public:
--- 12,15 ----
***************
*** 23,27 ****
  	void register_child2(pid_t pid);
  	void register_ssh(pid_t pid);
- 	void register_multiplexer(Multiplexer *multiplexer);
  	void killAll();
  	void waitforssh();
--- 21,24 ----

Index: registration.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/common/registration.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** registration.cpp	2 Jun 2005 09:31:13 -0000	1.1.1.1
--- registration.cpp	6 Jun 2005 12:32:35 -0000	1.2
***************
*** 28,43 ****
  		counter--;
  	} else if(pid == ssh_process) {
- 		if(multiplexer_) {
- 			output.information("ssh died! ", DEBUG_OUTPUT);
- 
- 			//multiplexer_->network_died();
- 		}
  		ssh_process = 0;
  	} //else
  	//	output.critical("unknown child died: " + int2string(pid),0);
- 	if(counter == 0)
- 		if(multiplexer_) {
- 			multiplexer_->die_onend();
- 		}
  }
  void Registration::child_died_abnormal(pid_t pid)
--- 28,34 ----
***************
*** 70,77 ****
  	ssh_process = pid;
  }
- void Registration::register_multiplexer(Multiplexer *multiplexer)
- {
- 	multiplexer_ = multiplexer;
- }
  void Registration::killAll()
  {
--- 61,64 ----

Index: backup_control.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/common/backup_control.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** backup_control.cpp	2 Jun 2005 11:43:03 -0000	1.3
--- backup_control.cpp	6 Jun 2005 12:32:35 -0000	1.4
***************
*** 9,12 ****
--- 9,15 ----
   
    $Log$
+   Revision 1.4  2005/06/06 12:32:35  siermerk
+   removed unused multiplexer-code
+ 
    Revision 1.3  2005/06/02 11:43:03  tali
    rename environment variables
***************
*** 107,111 ****
  #include "copier/distributor.hpp"
  #include "filesystem/dir_parser.hpp"
- #include "network/multiplexer.hpp"
  #include "common/int_handler.hpp"
  #include "common/registration.hpp"
--- 110,113 ----



-------------------------------------------------------
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