Changed code so that it compiles as C++.

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

diff --git a/asn/prt-add.c b/asn/prt-add.c
index 88a9807..aaec199 100644 (file)
--- a/asn/prt-add.c
+++ b/asn/prt-add.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1998, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-add.c,v $
- * Revision 1.2  1997-04-30 08:52:02  quinn
+ * Revision 1.4  1998-02-11 11:53:32  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.3  1998/01/05 09:04:57  adam
+ * Fixed bugs in encoders/decoders - Not operator (!) missing.
+ *
+ * Revision 1.2  1997/04/30 08:52:02  quinn
  * Null
  *
  * Revision 1.1  1996/10/10  11:52:18  quinn
@@ -17,7 +23,7 @@
 
 int z_ResultsByDBList (ODR o, Z_ResultsByDBList **p, int opt)
 {
-    if (odr_initmember (o, p, sizeof(**p)))
+    if (!odr_initmember (o, p, sizeof(**p)))
         return opt && odr_ok(o);
     if (odr_sequence_of (o, z_DatabaseName, &(*p)->elements,
         &(*p)->num))
@@ -29,8 +35,8 @@ int z_ResultsByDBList (ODR o, Z_ResultsByDBList **p, int opt)
 int z_ResultsByDB_elem (ODR o, Z_ResultsByDB_elem **p, int opt)
 {
     static Odr_arm arm[] = {
-        {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResultsByDB_all, odr_null},
-        {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResultsByDB_list, z_ResultsByDBList},
+        {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResultsByDB_all, (Odr_fun)odr_null},
+        {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResultsByDB_list, (Odr_fun)z_ResultsByDBList},
         {-1, -1, -1, -1, 0}
     };
     if (!odr_sequence_begin (o, p, sizeof(**p)))
@@ -48,9 +54,9 @@ int z_ResultsByDB_elem (ODR o, Z_ResultsByDB_elem **p, int opt)
 
 int z_ResultsByDB (ODR o, Z_ResultsByDB **p, int opt)
 {
-    if (odr_initmember (o, p, sizeof(**p)))
+    if (!odr_initmember (o, p, sizeof(**p)))
         return opt && odr_ok(o);
-    if (odr_sequence_of (o, z_ResultsByDB_elem, &(*p)->elements,
+    if (odr_sequence_of (o, (Odr_fun)z_ResultsByDB_elem, &(*p)->elements,
         &(*p)->num))
         return 1;
     *p = 0;
@@ -73,8 +79,8 @@ int z_QueryExpression (ODR o, Z_QueryExpression **p, int opt)
 {
     static Odr_arm arm[] = {
         {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_QueryExpression_term,
-         z_QueryExpressionTerm},
-        {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_QueryExpression_query, z_Query},
+         (Odr_fun)z_QueryExpressionTerm},
+        {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_QueryExpression_query, (Odr_fun)z_Query},
         {-1, -1, -1, -1, 0}
     };
     if (!odr_initmember(o, p, sizeof(**p)))
@@ -111,9 +117,9 @@ int z_SearchInfoReport_elem (ODR o, Z_SearchInfoReport_elem **p, int opt)
 
 int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt)
 {
-    if (odr_initmember (o, p, sizeof(**p)))
+    if (!odr_initmember (o, p, sizeof(**p)))
         return opt && odr_ok(o);
-    if (odr_sequence_of (o, z_SearchInfoReport_elem, &(*p)->elements,
+    if (odr_sequence_of (o, (Odr_fun)z_SearchInfoReport_elem, &(*p)->elements,
         &(*p)->num))
         return 1;
     *p = 0;