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

[subversion at boxbackup.org]

Author: chris
Date: 2014-02-07 21:54:35 +0000 (Fri, 07 Feb 2014)
New Revision: 3224

Modified:
   box/trunk/lib/server/makeprotocol.pl.in
Log:
Rename $cmd_class to $cmd_classes.

Makes code easier to read.

Modified: box/trunk/lib/server/makeprotocol.pl.in
===================================================================
--- box/trunk/lib/server/makeprotocol.pl.in	2014-02-07 21:54:28 UTC (rev 3223)
+++ box/trunk/lib/server/makeprotocol.pl.in	2014-02-07 21:54:35 UTC (rev 3224)
@@ -243,7 +243,8 @@
 }
 __E
 
-my %cmd_class;
+my %cmd_classes;
+my $error_message = undef;
 
 # output the classes
 foreach my $cmd (@cmd_list)
@@ -262,7 +263,7 @@
 	
 	my $cmd_base_class = join(", ", map {"public $_"} @cmd_base_classes);
 	my $cmd_class = $protocol_name."Protocol".$cmd;
-	$cmd_class{$cmd} = $cmd_class;
+	$cmd_classes{$cmd} = $cmd_class;
 	
 	print H <<__E;
 class $cmd_class : $cmd_base_class
@@ -665,8 +666,8 @@
 		my $has_stream = obj_is_type($cmd,'StreamWithCommand');
 		my $argextra = $has_stream?', std::auto_ptr<IOStream> apStream':'';
 		my $queryextra = $has_stream?', apStream':'';
-		my $request_class = $cmd_class{$cmd};
-		my $reply_class = $cmd_class{obj_get_type_params($cmd,'Command')};
+		my $request_class = $cmd_classes{$cmd};
+		my $reply_class = $cmd_classes{obj_get_type_params($cmd,'Command')};
 		
 		print H "\tvirtual std::auto_ptr<$reply_class> Query(const $request_class &rQuery$argextra) = 0;\n";
 		my @a;
@@ -769,8 +770,8 @@
 				my $has_stream = obj_is_type($cmd,'StreamWithCommand');
 				my $argextra = $has_stream?', std::auto_ptr<IOStream> apStream':'';
 				my $queryextra = $has_stream?', apStream':'';
-				my $request_class = $cmd_class{$cmd};
-				my $reply_class = $cmd_class{obj_get_type_params($cmd,'Command')};
+				my $request_class = $cmd_classes{$cmd};
+				my $reply_class = $cmd_classes{obj_get_type_params($cmd,'Command')};
 				print H "\tstd::auto_ptr<$reply_class> Query(const $request_class &rQuery$argextra);\n";
 			}
 		}
@@ -909,7 +910,7 @@
 	{
 		print CPP <<__E;
 	case $cmd_id{$cmd}:
-		return std::auto_ptr<Message>(new $cmd_class{$cmd}());
+		return std::auto_ptr<Message>(new $cmd_classes{$cmd}());
 		break;
 __E
 	}
@@ -1011,9 +1012,9 @@
 		{
 			if(obj_is_type($cmd,'Command'))
 			{
-				my $request_class = $cmd_class{$cmd};
+				my $request_class = $cmd_classes{$cmd};
 				my $reply_msg = obj_get_type_params($cmd,'Command');
-				my $reply_class = $cmd_class{$reply_msg};
+				my $reply_class = $cmd_classes{$reply_msg};
 				my $reply_id = $cmd_id{$reply_msg};
 				my $has_stream = obj_is_type($cmd,'StreamWithCommand');
 				my $argextra = $has_stream?', std::auto_ptr<IOStream> apStream':'';