[eros-cvs] cvs commit: eros/src/base/sys/key mk_Discrim.cxx

[shap@eros.cs.jhu.edu]

shap        01/04/24 17:32:22

  Modified:    src/base/sys/key mk_Discrim.cxx
  Log:
  Be sure to set the return codes

Revision  Changes    Path
1.26      +5 -3      eros/src/base/sys/key/mk_Discrim.cxx

Index: mk_Discrim.cxx
===================================================================
RCS file: /cvs/eros/src/base/sys/key/mk_Discrim.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mk_Discrim.cxx	2001/04/24 15:43:29	1.25
+++ mk_Discrim.cxx	2001/04/24 21:32:22	1.26
@@ -73,7 +73,8 @@
 
     COMMIT_POINT();
   
-    inv.exit.code = 0;		/* default is not discrete */
+    inv.exit.code = RC_OK;
+    inv.exit.w1 = 0;		/* default is not discrete */
     switch(inv.entry.key[0]->GetType()) {
     case KtDataPage:
       if (inv.entry.key[0]->IsReadOnly())
@@ -103,13 +104,14 @@
     return;
 
   case OC_Discrim_Compare:
-    inv.exit.w1 = 1;
-
     inv.entry.key[0]->Prepare();
     inv.entry.key[1]->Prepare();
     
     COMMIT_POINT();
   
+    inv.exit.code = RC_OK;
+    inv.exit.w1 = 1;
+
     if (inv.entry.key[0]->GetType() != inv.entry.key[1]->GetType())
       inv.exit.w1 = 0;
     else if ( inv.entry.key[0]->IsObjectKey() ) {