rename the rpc member from kill to attack; that way the

structure does not have the same name.  might find some
bugs.


svn:r449

2 files changed, 6 insertions, 6 deletions

diff --git a/test/regress.c b/test/regress.c
index 41b78b90..9366496f 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -962,7 +962,7 @@ void
 rpc_test(void)
 {
 	struct msg *msg, *msg2;
-	struct kill *kill;
+	struct kill *attack;
 	struct run *run;
 	struct evbuffer *tmp = evbuffer_new();
 	struct timeval tv_start, tv_end;
@@ -974,13 +974,13 @@ rpc_test(void)
 	EVTAG_ASSIGN(msg, from_name, "niels");
 	EVTAG_ASSIGN(msg, to_name, "phoenix");
 
-	if (EVTAG_GET(msg, kill, &kill) == -1) {
+	if (EVTAG_GET(msg, attack, &attack) == -1) {
 		fprintf(stderr, "Failed to set kill message.\n");
 		exit(1);
 	}
 
-	EVTAG_ASSIGN(kill, weapon, "feather");
-	EVTAG_ASSIGN(kill, action, "tickle");
+	EVTAG_ASSIGN(attack, weapon, "feather");
+	EVTAG_ASSIGN(attack, action, "tickle");
 
 	gettimeofday(&tv_start, NULL);
 	for (i = 0; i < 1000; ++i) {
@@ -1013,7 +1013,7 @@ rpc_test(void)
 
 	if (!EVTAG_HAS(msg2, from_name) ||
 	    !EVTAG_HAS(msg2, to_name) ||
-	    !EVTAG_HAS(msg2, kill)) {
+	    !EVTAG_HAS(msg2, attack)) {
 		fprintf(stderr, "Missing data structures.\n");
 		exit(1);
 	}
diff --git a/test/regress.rpc b/test/regress.rpc
index 7bc6b75d..03537ccd 100644
--- a/test/regress.rpc
+++ b/test/regress.rpc
@@ -3,7 +3,7 @@
 struct msg {
 	string from_name = 1;
 	string to_name = 2;
-	optional struct[kill] kill = 3;
+	optional struct[kill] attack = 3;
 	array struct[run] run = 4;
 }