From ac2136c8caf1f2a8c6f458cd1775e9bf1c18aa71 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 20 Apr 1999 10:01:46 +0000
Subject: [PATCH] Modified calls to ODR encoders/decoders (name argument).

---
 CHANGELOG |    3 +--
 ir-tcl.c  |   11 +++++++----
 queue.c   |   10 ++++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d7f85ce..3869c6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-$Id: CHANGELOG,v 1.40 1999-03-22 06:51:34 adam Exp $
+$Id: CHANGELOG,v 1.41 1999-04-20 10:01:46 adam Exp $
 
 06/19/95 Release of ir-tcl-1.0b
 ------------------------------------------------------
@@ -129,4 +129,3 @@ $Id: CHANGELOG,v 1.40 1999-03-22 06:51:34 adam Exp $
 03/22/99 Added Z39.50 sort. The following methods have been implemented:
          sort (sends sort PDU), sortResponse (specifies sort handle) and
          sortStatus (returns sort status - after response).
-------------------------------------------------------
diff --git a/ir-tcl.c b/ir-tcl.c
index 5448889..57792b0 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -5,7 +5,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.112  1999-03-22 06:51:34  adam
+ * Revision 1.113  1999-04-20 10:01:46  adam
+ * Modified calls to ODR encoders/decoders (name argument).
+ *
+ * Revision 1.112  1999/03/22 06:51:34  adam
  * Implemented sort.
  *
  * Revision 1.111  1999/02/11 11:30:09  adam
@@ -2709,7 +2712,7 @@ static int do_getExplain (void *o, Tcl_Interp *interp, int argc, char **argv)
         return TCL_OK;
     assert (rl->u.dbrec.buf);
     odr_setbuf (p->odr_in, rl->u.dbrec.buf, rl->u.dbrec.size, 0);
-    if (!(*etype->fun)(p->odr_in, (char **) &rr, 0))
+    if (!(*etype->fun)(p->odr_in, (char **) &rr, 0, 0))
         return TCL_OK;
     
     if (etype->what != Z_External_explainRecord)
@@ -3881,7 +3884,7 @@ static void ir_handleDBRecord (IrTcl_Obj *p, IrTcl_RecordList *rl,
         
         odr_setbuf (p->odr_in, (char*) oe->u.octet_aligned->buf,
                     oe->u.octet_aligned->len, 0);
-        if (!(*etype->fun)(p->odr_in, (char **) &rr, 0))
+        if (!(*etype->fun)(p->odr_in, (char **) &rr, 0, 0))
         {
             rl->u.dbrec.type = VAL_NONE;
             return;
@@ -4273,7 +4276,7 @@ static void ir_select_read (ClientData clientData)
         p->apduOffset = -1;
         odr_setbuf (p->odr_in, p->buf_in, r, 0);
         logf (LOG_DEBUG, "cs_get ok, total size %d", r);
-        if (!z_APDU (p->odr_in, &apdu, 0))
+        if (!z_APDU (p->odr_in, &apdu, 0, 0))
         {
             logf (LOG_DEBUG, "cs_get failed: %s",
                 odr_errmsg (odr_geterror (p->odr_in)));
diff --git a/queue.c b/queue.c
index 2ec36f0..c25ade1 100644
--- a/queue.c
+++ b/queue.c
@@ -1,12 +1,14 @@
-
 /*
  * IR toolkit for tcl/tk
- * (c) Index Data 1995
+ * (c) Index Data 1995-1999
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: queue.c,v $
- * Revision 1.11  1996-07-03 13:31:14  adam
+ * Revision 1.12  1999-04-20 10:01:46  adam
+ * Modified calls to ODR encoders/decoders (name argument).
+ *
+ * Revision 1.11  1996/07/03 13:31:14  adam
  * The xmalloc/xfree functions from YAZ are used to manage memory.
  *
  * Revision 1.10  1996/06/03  09:04:24  adam
@@ -64,7 +66,7 @@ int ir_tcl_send_APDU (Tcl_Interp *interp, IrTcl_Obj *p, Z_APDU *apdu,
 {
     IrTcl_Request **rp;
 
-    if (!z_APDU (p->odr_out, &apdu, 0))
+    if (!z_APDU (p->odr_out, &apdu, 0, 0))
     {
         Tcl_AppendResult (interp, odr_errmsg (odr_geterror (p->odr_out)),
                           NULL);
-- 
1.7.10.4