X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=3fe440184dd157726a90cb294cee4538ae0435e9;hp=fe086fa29d9cf7d02517770b3ab3ca8c0a9b81c8;hb=dffa37262abe124e347fc19d7cc8a4cfa3a613bf;hpb=205c8de99c5cfe2eb4a0cfbeed34603ebf49b318

diff --git a/asn/proto.c b/asn/proto.c
index fe086fa..3fe4401 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.17  1995-04-10 10:22:22  quinn
+ * Revision 1.20  1995-05-15 11:55:25  quinn
+ * Smallish.
+ *
+ * Revision 1.19  1995/04/11  11:58:35  quinn
+ * Fixed bug.
+ *
+ * Revision 1.18  1995/04/11  11:52:02  quinn
+ * Fixed possible buf in proto.c
+ *
+ * Revision 1.17  1995/04/10  10:22:22  quinn
  * Added SCAN.
  *
  * Revision 1.16  1995/03/30  10:26:43  quinn
@@ -586,7 +595,7 @@ int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
     	&(*p)->num_attributes))
     	return 1;
     *p = 0;
-    return 0;
+    return opt && !o->error;
 }
 
 /*
@@ -639,7 +648,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
     	&(*p)->num_terms))
     	return 1;
     *p = 0;
-    return 0;
+    return opt && !o->error;
 }
 
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
@@ -710,7 +719,7 @@ int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
     else if (!*p)
     	return opt;
 
-    if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+	if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
     	&(*p)->num_diagRecs))
     	return 1;
     *p = 0;
@@ -856,9 +865,18 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
     	{ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest, z_InitRequest},
     	{ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse, z_InitResponse},
     	{ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest, z_SearchRequest},
-    	{ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse, z_SearchResponse},
-    	{ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest, z_PresentRequest},
-    	{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse, z_PresentResponse},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse,
+	    z_SearchResponse},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest,
+	    z_PresentRequest},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
+	    z_PresentResponse},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
+	    z_ResourceControlRequest},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
+	    z_ResourceControlResponse},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 32, Z_APDU_triggerResourceControlRequest,
+	    z_TriggerResourceControlRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},