X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=0b5972493418cfbd3df06353c4a27bcc970aefe7;hb=9cae644f09ee79ffea80f800b5b037fd8e12304e;hp=e874e31ced5f12241ca757ef6e85b13040595e58;hpb=9f6bbd483ea92b4a5ae114a36bfebd942e138460;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index e874e31..0b59724 100644
--- a/client/client.c
+++ b/client/client.c
@@ -3,7 +3,13 @@
  * See the file LICENSE for details.
  *
  * $Log: client.c,v $
- * Revision 1.112  2001-02-20 11:25:32  adam
+ * Revision 1.114  2001-02-21 13:46:53  adam
+ * C++ fixes.
+ *
+ * Revision 1.113  2001/02/21 09:41:15  adam
+ * Fixed problem with old codecs.
+ *
+ * Revision 1.112  2001/02/20 11:25:32  adam
  * Added ill_get_APDU and ill_get_Cancel.
  *
  * Revision 1.111  2001/01/30 15:52:48  ja7
@@ -1366,7 +1372,8 @@ static Z_External *create_external_itemRequest()
         
         r->u.single_ASN1_type = (Odr_oct *)
             odr_malloc (out, sizeof(*r->u.single_ASN1_type));
-        r->u.single_ASN1_type->buf = odr_malloc (out, item_request_size);
+        r->u.single_ASN1_type->buf = (unsigned char *)
+	    odr_malloc (out, item_request_size);
         r->u.single_ASN1_type->len = item_request_size;
         r->u.single_ASN1_type->size = item_request_size;
         memcpy (r->u.single_ASN1_type->buf, item_request_buf,
@@ -1429,7 +1436,8 @@ static Z_External *create_external_ILL_APDU(int which)
         
         r->u.single_ASN1_type = (Odr_oct *)
             odr_malloc (out, sizeof(*r->u.single_ASN1_type));
-        r->u.single_ASN1_type->buf = odr_malloc (out, ill_request_size);
+        r->u.single_ASN1_type->buf = (unsigned char *)
+	    odr_malloc (out, ill_request_size);
         r->u.single_ASN1_type->len = ill_request_size;
         r->u.single_ASN1_type->size = ill_request_size;
         memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
@@ -1492,6 +1500,7 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno)
         (int *) odr_malloc(out, sizeof(int));
     *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
 
+#ifdef ASN_COMPILED
     if (!strcmp (type, "item") || !strcmp(type, "2"))
     {
         printf ("using item-request\n");
@@ -1506,6 +1515,10 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno)
     }
     else
         r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
+
+#else
+    r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
+#endif
     return r;
 }
 
@@ -1903,7 +1916,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
             req->termListAndStartPoint->term->u.general)
         {
             req->termListAndStartPoint->term->u.general->buf =
-                odr_strdup(out, term);
+                (unsigned char *) odr_strdup(out, term);
             req->termListAndStartPoint->term->u.general->len =
                 req->termListAndStartPoint->term->u.general->size =
                 strlen(term);