[eros-cvs] cvs commit: eros/src/base/domain/constructor constructor.c metaconstructor.c

[shap@eros.cs.jhu.edu]

shap        01/08/28 20:47:44

  Modified:    src/base/domain/constructor constructor.c metaconstructor.c
  Log:
  Fix the return code handling in the constructor discretion test.

Revision  Changes    Path
1.34      +3 -2      eros/src/base/domain/constructor/constructor.c

Index: constructor.c
===================================================================
RCS file: /cvs/eros/src/base/domain/constructor/constructor.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- constructor.c	2001/05/24 04:37:54	1.33
+++ constructor.c	2001/08/29 00:47:44	1.34
@@ -422,9 +422,10 @@
   case OC_Constructor_IsDiscrete:
     {
       if (ci->frozen && !ci->has_holes)
-	msg->snd_code = 1;
+	msg->snd_w1 = 1;
       else
-	msg->snd_code = 0;
+	msg->snd_w1 = 0;
+      msg->snd_code = RC_OK;
 
       return 1;
     }      



1.25      +2 -1      eros/src/base/domain/constructor/metaconstructor.c

Index: metaconstructor.c
===================================================================
RCS file: /cvs/eros/src/base/domain/constructor/metaconstructor.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- metaconstructor.c	2001/05/24 04:37:54	1.24
+++ metaconstructor.c	2001/08/29 00:47:44	1.25
@@ -220,7 +220,8 @@
   switch (msg->rcv_code) {
   case OC_Constructor_IsDiscrete:
     {
-      msg->snd_code = 1;	/* answer YES */
+      msg->snd_w1 = 1;		/* answer YES */
+      msg->snd_code = RC_OK;
 
       return 1;
     }