*** empty log message ***

[yaz-moved-to-github.git] / asn / proto.c

diff --git a/asn/proto.c b/asn/proto.c
index 6930f81..3f17ff0 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.23  1995-05-22 11:30:18  quinn
+ * Revision 1.25  1995-05-25 11:00:08  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.24  1995/05/22  13:58:18  quinn
+ * Fixed an ODR_NULLVAL.
+ *
+ * Revision 1.23  1995/05/22  11:30:18  quinn
  * Adding Z39.50-1992 stuff to proto.c. Adding zget.c
  *
  * Revision 1.22  1995/05/17  08:40:56  quinn
@@ -124,10 +130,10 @@ int z_IdPass(ODR o, Z_IdPass **p, int opt)
     if (!odr_sequence_begin(o, p, sizeof(**p)))
        return opt && odr_ok(o);
     return
-       odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
-       odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
+       odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 1) &&
+       odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 1) &&
        odr_implicit(o, odr_visiblestring, &(*p)->password, ODR_CONTEXT, 2,
-           0) &&
+           1) &&
        odr_sequence_end(o);
 }
 
@@ -425,7 +431,6 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
        {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, z_ProximityOperator},
        {-1, -1, -1, -1, 0}
     };
-    int dummy = 999;
 
     if (!*p && o->direction != ODR_DECODE)
        return opt;
@@ -434,7 +439,7 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
     if (o->direction == ODR_DECODE)
        *p = odr_malloc(o, sizeof(**p));
     else
-       (*p)->u.and = &dummy;
+       (*p)->u.and = ODR_NULLVAL;
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
        odr_constructed_end(o))