X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-acc.c;h=d30bcfdf0a425e37d98bc1787ef6acfb86860390;hp=93ca15272f00a14e0600805bc759542e84c82623;hb=8030536c98d595898b316df5eb118b1d6398450c;hpb=6edc916a5a8d44e1d7708f5018828e0d2020690b

diff --git a/asn/prt-acc.c b/asn/prt-acc.c
index 93ca152..d30bcfd 100644
--- a/asn/prt-acc.c
+++ b/asn/prt-acc.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-acc.c,v $
- * Revision 1.1  1995-06-02 09:49:15  quinn
+ * Revision 1.7  1998-02-11 11:53:32  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6  1998/01/05 09:04:57  adam
+ * Fixed bugs in encoders/decoders - Not operator (!) missing.
+ *
+ * Revision 1.5  1995/09/29 17:11:53  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:41  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/15  11:59:41  quinn
+ * Updated External
+ *
+ * Revision 1.2  1995/06/05  10:52:05  quinn
+ * Fixed some negligences.
+ *
+ * Revision 1.1  1995/06/02  09:49:15  quinn
  * Adding access control
  *
  *
@@ -40,14 +58,16 @@ int z_PromptId1(ODR o, Z_PromptId1 **p, int opt)
     static Odr_arm arm[] =
     {
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptId1_enumeratedPrompt,
-	    z_EnumeratedPrompt1},
+	    (Odr_fun)z_EnumeratedPrompt1},
 	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptId1_nonEnumeratedPrompt,
 	    odr_visiblestring},
 	{-1, -1, -1, -1, 0}
     };
 
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, sizeof(**p));
+    	*p = (Z_PromptId1 *)odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
@@ -61,12 +81,14 @@ int z_PromptInfo1(ODR o, Z_PromptInfo1 **p, int opt)
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Challenge1_character,
 	    odr_visiblestring},
 	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Challenge1_encrypted,
-	    z_Encryption1},
+	    (Odr_fun)z_Encryption1},
 	{-1, -1, -1, -1, 0}
     };
 
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, sizeof(**p));
+    	*p = (Z_PromptInfo1 *)odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
@@ -89,14 +111,17 @@ int z_ChallengeUnit1(ODR o, Z_ChallengeUnit1 **p, int opt)
 	    &(*p)->num_values) || odr_ok(o)) &&
 	odr_implicit(o, odr_null, &(*p)->shouldSave, ODR_CONTEXT, 7, 1) &&
 	odr_implicit(o, odr_integer, &(*p)->dataType, ODR_CONTEXT, 8, 1) &&
+	odr_implicit(o, z_External, &(*p)->diagnostic, ODR_CONTEXT, 9, 1) &&
 	odr_sequence_end(o);
 }
 
 int z_Challenge1(ODR o, Z_Challenge1 **p, int opt)
 {
     if (o->direction == ODR_ENCODE)
-    	*p = odr_malloc(o, sizeof(**p));
-    if (odr_sequence_of(o, z_ChallengeUnit1, &(*p)->list,
+    	*p = (Z_Challenge1 *)odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
+    if (odr_sequence_of(o, (Odr_fun)z_ChallengeUnit1, &(*p)->list,
 	&(*p)->num_challenges))
 	return 1;
     *p = 0;
@@ -110,14 +135,14 @@ int z_ResponseUnit1(ODR o, Z_ResponseUnit1 **p, int opt)
     static Odr_arm arm[] = 
     {
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Response1_string, odr_visiblestring},
-	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Response1_accept, odr_bool},
-	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Response1_acknowledge, odr_null},
-	{ODR_EXPLICIT, ODR_CONTEXT, 4, Z_Response1_diagnostic, z_DiagRec},
-	{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Response1_encrypted, z_Encryption1},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Response1_accept, (Odr_fun)odr_bool},
+	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Response1_acknowledge, (Odr_fun)odr_null},
+	{ODR_EXPLICIT, ODR_CONTEXT, 4, Z_Response1_diagnostic, (Odr_fun)z_DiagRec},
+	{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Response1_encrypted, (Odr_fun)z_Encryption1},
 	{-1, -1, -1, -1, 0}
     };
 
-    if (odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
     return
     	odr_explicit(o, z_PromptId1, &(*p)->promptId, ODR_CONTEXT, 1, 0) &&
@@ -130,8 +155,10 @@ int z_ResponseUnit1(ODR o, Z_ResponseUnit1 **p, int opt)
 int z_Response1(ODR o, Z_Response1 **p, int opt)
 {
     if (o->direction == ODR_ENCODE)
-    	*p = odr_malloc(o, sizeof(**p));
-    if (odr_sequence_of(o, z_ResponseUnit1, &(*p)->list,
+    	*p = (Z_Response1 *)odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
+    if (odr_sequence_of(o, (Odr_fun)z_ResponseUnit1, &(*p)->list,
 	&(*p)->num_responses))
 	return 1;
     *p = 0;
@@ -142,13 +169,15 @@ int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt)
 {
     static Odr_arm arm[] =
     {
-    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptObject1_challenge, z_Challenge1},
-	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptObject1_response, z_Response1},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptObject1_challenge, (Odr_fun)z_Challenge1},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptObject1_response, (Odr_fun)z_Response1},
 	{-1, -1, -1, -1, 0}
     };
 
     if (o->direction == ODR_DECODE)
-    	*p = odr_malloc(o, sizeof(**p));
+    	*p = (Z_PromptObject1 *)odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;