Added Explain

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

diff --git a/asn/proto.c b/asn/proto.c
index 5c87b25..ccab40f 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.32  1995-06-19 12:37:28  quinn
+ * Revision 1.35  1995-08-10 08:53:59  quinn
+ * Added Explain
+ *
+ * Revision 1.34  1995/06/19  17:01:48  quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.33  1995/06/19  13:39:56  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.32  1995/06/19  12:37:28  quinn
  * Fixed a bug in the compspec.
  *
  * Revision 1.31  1995/06/16  13:15:56  quinn
@@ -135,6 +144,11 @@ int z_ResultSetId(ODR o, char **p, int opt)
        opt);
 }
 
+int z_ElementSetName(ODR o, char **p, int opt)
+{
+    return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
+}
+
 int z_UserInformationField(ODR o, Odr_external **p, int opt)
 {
     return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT,
@@ -414,12 +428,6 @@ int z_ResourceControlResponse(ODR o, Z_ResourceControlResponse **p, int opt)
 
 /* ------------------------ SEARCH SERVICE ----------------------- */
 
-int z_ElementSetName(ODR o, char **p, int opt)
-{
-    return odr_implicit(o, odr_visiblestring, (char**) p, ODR_CONTEXT, 103,
-       opt);
-}
-
 int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -458,7 +466,7 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
 
     if (o->direction == ODR_DECODE)
        *p = odr_malloc(o, sizeof(**p));
-    else
+    else if (!*p)
        return opt && odr_ok(o);
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
@@ -748,7 +756,7 @@ int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
        {-1, -1, -1, Z_DiagForm_v2AddInfo, odr_visiblestring},
        {-1, -1, -1, Z_DiagForm_v3AddInfo, z_InternationalString},
        {ODR_IMPLICIT, ODR_CONTEXT, ODR_VISIBLESTRING, Z_DiagForm_v2AddInfo,
-           odr_visiblestring}, /* to match some weird server.. */
+           odr_visiblestring}, /* To cater to a bug in the CNIDR servers */
        {-1, -1, -1, -1, 0}
     };
     if (!odr_sequence_begin(o, p, sizeof(**p)))