[eros-cvs] cvs commit: eros/src/base/sys/libkey lk_discrim_verify.c
shap@eros.cs.jhu.edu
shap@eros.cs.jhu.edu
Wed, 29 Aug 2001 22:08:07 -0400
shap 01/08/29 22:08:07
Modified: src/base/domain/constructor constructor.c metaconstructor.c
src/base/lib/domain/include ConstructorKey.h
src/base/lib/domain/key constructor_is_discreet.c
src/base/sys/libkey lk_discrim_verify.c
Log:
I really cannot spell discreet correctly, can I?
Revision Changes Path
1.36 +15 -15 eros/src/base/domain/constructor/constructor.c
Index: constructor.c
===================================================================
RCS file: /cvs/eros/src/base/domain/constructor/constructor.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- constructor.c 2001/08/29 00:52:24 1.35
+++ constructor.c 2001/08/30 02:08:07 1.36
@@ -105,12 +105,12 @@
{
uint32_t result;
uint32_t keyInfo;
- uint32_t isDiscrete;
+ uint32_t isDiscreet;
node_copy(KR_CONSTIT, KC_DISCRIM, KR_SCRATCH);
- result = discrim_verify(KR_SCRATCH, kr, &isDiscrete);
- if (result == RC_OK && isDiscrete)
+ result = discrim_verify(KR_SCRATCH, kr, &isDiscreet);
+ if (result == RC_OK && isDiscreet)
return;
node_copy(KR_CONSTIT, KC_DCC, KR_SCRATCH);
@@ -118,11 +118,11 @@
result = proccre_amplify_gate(KR_SCRATCH, kr, KR_SCRATCH, 0, &keyInfo);
if (result == RC_OK && keyInfo == 0) {
- uint32_t isDiscrete;
+ uint32_t isDiscreet;
/* This key is a requestor's key to a constructor. Ask the
- constructor if it is discrete */
- result = constructor_is_discreet(kr, &isDiscrete);
- if (result == RC_OK && isDiscrete)
+ constructor if it is discreet */
+ result = constructor_is_discreet(kr, &isDiscreet);
+ if (result == RC_OK && isDiscreet)
return;
}
@@ -340,24 +340,24 @@
{
uint32_t result;
uint32_t keyInfo;
- uint32_t isDiscrete;
+ uint32_t isDiscreet;
node_copy(KR_CONSTIT, KC_DISCRIM, KR_SCRATCH);
DEBUG kdprintf(KR_OSTREAM, "constructor: is_not_discreet(): discrim_verify\n");
- discrim_verify(KR_SCRATCH, kr, &isDiscrete);
- if (isDiscrete)
+ discrim_verify(KR_SCRATCH, kr, &isDiscreet);
+ if (isDiscreet)
return 0; /* ok */
DEBUG kdprintf(KR_OSTREAM, "constructor: is_not_discreet(): proccre_amplify\n");
result = proccre_amplify_gate(KR_DOMCRE, kr, KR_SCRATCH, 0, &keyInfo);
if (keyInfo == 0) {
- uint32_t isDiscrete;
+ uint32_t isDiscreet;
/* This key is a requestor's key to a constructor. Ask the
- constructor if it is discrete */
- result = constructor_is_discreet(kr, &isDiscrete);
- if (result == RC_OK && isDiscrete)
+ constructor if it is discreet */
+ result = constructor_is_discreet(kr, &isDiscreet);
+ if (result == RC_OK && isDiscreet)
return 0; /* ok */
}
@@ -419,7 +419,7 @@
msg->snd_invKey = KR_RESUME;
switch (msg->rcv_code) {
- case OC_Constructor_IsDiscrete:
+ case OC_Constructor_IsDiscreet:
{
if (ci->frozen && !ci->has_holes)
msg->snd_w1 = 1;
1.27 +1 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- metaconstructor.c 2001/08/29 00:52:24 1.26
+++ metaconstructor.c 2001/08/30 02:08:07 1.27
@@ -218,7 +218,7 @@
msg->snd_invKey = KR_RESUME;
switch (msg->rcv_code) {
- case OC_Constructor_IsDiscrete:
+ case OC_Constructor_IsDiscreet:
{
msg->snd_w1 = 1; /* answer YES */
msg->snd_code = RC_OK;
1.17 +3 -3 eros/src/base/lib/domain/include/ConstructorKey.h
Index: ConstructorKey.h
===================================================================
RCS file: /cvs/eros/src/base/lib/domain/include/ConstructorKey.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConstructorKey.h 2001/04/29 19:31:47 1.16
+++ ConstructorKey.h 2001/08/30 02:08:07 1.17
@@ -21,13 +21,13 @@
* Foundation, 59 Temple Place - Suite 330 Boston, MA 02111-1307, USA.
*/
-#define OC_Constructor_IsDiscrete 1
+#define OC_Constructor_IsDiscreet 1
#define OC_Constructor_Request 2
#define OC_Constructor_Seal 3
#define OC_Constructor_Insert 4
/* Also add #defines for the error return values... */
-#define RC_Constructor_Indiscrete 1
+#define RC_Constructor_Indiscreet 1
#define RC_Constructor_NotSealed 2
#define RC_Constructor_NotBuilder 3
@@ -40,7 +40,7 @@
uint32_t constructor_request(uint32_t krConstructor, uint32_t krBank,
uint32_t krSched, uint32_t krArg0,
uint32_t krProduct /* OUT */);
-uint32_t constructor_is_discreet(uint32_t krConstructor, uint32_t *isDiscrete);
+uint32_t constructor_is_discreet(uint32_t krConstructor, uint32_t *isDiscreet);
uint32_t constructor_seal(uint32_t krConstructor, uint32_t krRequestor);
uint32_t constructor_insert(uint32_t krConstructor, uint32_t ndx,
uint32_t krConstit);
1.17 +3 -3 eros/src/base/lib/domain/key/constructor_is_discreet.c
Index: constructor_is_discreet.c
===================================================================
RCS file: /cvs/eros/src/base/lib/domain/key/constructor_is_discreet.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- constructor_is_discreet.c 2001/05/24 04:37:56 1.16
+++ constructor_is_discreet.c 2001/08/30 02:08:07 1.17
@@ -24,7 +24,7 @@
/* Copy key from node slot to key register */
uint32_t
-constructor_is_discreet(uint32_t krConstructor, uint32_t *isDiscrete)
+constructor_is_discreet(uint32_t krConstructor, uint32_t *isDiscreet)
{
uint32_t result;
Message msg;
@@ -49,11 +49,11 @@
/* No string arg == I'll take anything */
msg.snd_invKey = krConstructor;
- msg.snd_code = OC_Constructor_IsDiscrete;
+ msg.snd_code = OC_Constructor_IsDiscreet;
result = CALL(&msg);
- if (isDiscrete) *isDiscrete = msg.rcv_w1;
+ if (isDiscreet) *isDiscreet = msg.rcv_w1;
return result;
}
1.18 +1 -1 eros/src/base/sys/libkey/lk_discrim_verify.c
Index: lk_discrim_verify.c
===================================================================
RCS file: /cvs/eros/src/base/sys/libkey/lk_discrim_verify.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lk_discrim_verify.c 2001/08/30 01:59:31 1.17
+++ lk_discrim_verify.c 2001/08/30 02:08:07 1.18
@@ -50,7 +50,7 @@
result = CALL(&msg);
- (*isDiscreet) = msg.rcv_w1;
+ if (*isDiscreet) *isDiscreet = msg.rcv_w1;
return result;
}