[Box Backup-commit] COMMIT r3299 - box/trunk/lib/server

[subversion at boxbackup.org]

Author: chris
Date: 2014-03-02 08:59:12 +0000 (Sun, 02 Mar 2014)
New Revision: 3299

Modified:
   box/trunk/lib/server/makeprotocol.pl.in
Log:
Fix whitespace and comments, remove redundant code in protocol generator.

Modified: box/trunk/lib/server/makeprotocol.pl.in
===================================================================
--- box/trunk/lib/server/makeprotocol.pl.in	2014-03-02 08:59:03 UTC (rev 3298)
+++ box/trunk/lib/server/makeprotocol.pl.in	2014-03-02 08:59:12 UTC (rev 3299)
@@ -785,6 +785,7 @@
 class $server_or_client_class : $base_classes_str
 {
 public:
+	virtual ~$server_or_client_class();
 __E
 
 	if($writing_local)
@@ -797,17 +798,11 @@
 	{
 		print H <<__E;
 	$server_or_client_class(std::auto_ptr<SocketStream> apConn);
-private:
 	std::auto_ptr<$message_base_class> Receive();
 	void Send(const $message_base_class &rObject);
-public:
 __E
 	}
 	
-	print H <<__E;
-	virtual ~$server_or_client_class();
-__E
-
 	if($writing_server)
 	{
 		# need to put in the conversation function
@@ -839,12 +834,6 @@
 		print H <<__E;
 private:
 	$context_class &mrContext;
-__E
-	}
-	
-	if($writing_local)
-	{
-		print H <<__E;
 public:
 	virtual std::auto_ptr<IOStream> ReceiveStream()
 	{
@@ -857,7 +846,6 @@
 	else
 	{
 		print H <<__E;
-public:
 	virtual std::auto_ptr<IOStream> ReceiveStream();
 __E
 
@@ -904,7 +892,7 @@
 	}
 __E
 	}	
-	
+
 	print H <<__E;
 
 private:
@@ -1030,7 +1018,7 @@
 		}
 		
 		// As a server, if we get an unexpected message later, we'll
-		// want to know/ the last command that we received, and the
+		// want to know the last command that we received, and the
 		// reply, to help debug our response to it.
 		mPreviousCommand = pobj->ToString();
 		std::ostringstream reply;
@@ -1087,7 +1075,7 @@
 					print CPP <<__E;
 	// Send query
 	Send(rQuery);
-	$send_stream_extra
+$send_stream_extra
 	
 	// Wait for the reply
 	std::auto_ptr<$message_base_class> preply = Receive();