Goodbye to Odr_oct.size

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index e6dd25a..58f7006 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -323,9 +323,6 @@ static Z_ReferenceId *set_refid(ODR out)
         return 0;
     id = (Z_ReferenceId *) odr_malloc(out, sizeof(*id));
     id->len = strlen(refid);
-#if OCT_SIZE
-    id->size = id->len;
-#endif
     id->buf = (char *) odr_malloc(out, id->len);
     memcpy(id->buf, refid, id->len);
     return id;
@@ -1569,9 +1566,6 @@ static int send_Z3950_searchRequest(const char *arg)
         /* send a very big referenceid to test transport stack etc. */
         memset(big, 'A', 2100);
         bigo.len = 2100;
-#if OCT_SIZE
-        bigo.size = bigo.len;
-#endif
         bigo.buf = big;
         req->referenceId = &bigo;
     }
@@ -2141,9 +2135,6 @@ static Z_External *create_external_itemRequest(void)
         r->u.single_ASN1_type->buf = (char *)
             odr_malloc(out, item_request_size);
         r->u.single_ASN1_type->len = item_request_size;
-#if OCT_SIZE
-        r->u.single_ASN1_type->size = item_request_size;
-#endif
         memcpy(r->u.single_ASN1_type->buf, item_request_buf,
                 item_request_size);
 
@@ -2196,9 +2187,6 @@ static Z_External *create_external_ILL_APDU(void)
         r->u.single_ASN1_type->buf = (char *)
             odr_malloc(out, ill_request_size);
         r->u.single_ASN1_type->len = ill_request_size;
-#if OCT_SIZE
-        r->u.single_ASN1_type->size = ill_request_size;
-#endif
         memcpy(r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
 /*         printf("len = %d\n", ill_request_size); */
 /*              do_hex_dump(ill_request_buf,ill_request_size); */
@@ -2497,9 +2485,6 @@ static int send_Z3950_update(int version, int action_no, const char *recid,
             notToKeep->elements[0]->u.opaque = (Odr_oct *)
                 odr_malloc(out, sizeof(Odr_oct));
             notToKeep->elements[0]->u.opaque->buf = (char *) recid;
-#if OCT_SIZE
-            notToKeep->elements[0]->u.opaque->size = strlen(recid);
-#endif
             notToKeep->elements[0]->u.opaque->len = strlen(recid);
         }
         else
@@ -2546,9 +2531,6 @@ static int send_Z3950_update(int version, int action_no, const char *recid,
             notToKeep->elements[0]->u.opaque = (Odr_oct *)
                 odr_malloc(out, sizeof(Odr_oct));
             notToKeep->elements[0]->u.opaque->buf = (char *) recid;
-#if OCT_SIZE
-            notToKeep->elements[0]->u.opaque->size = strlen(recid);
-#endif
             notToKeep->elements[0]->u.opaque->len = strlen(recid);
         }
         else
@@ -3403,9 +3385,6 @@ static int send_Z3950_scanrequest(const char *set,  const char *query,
             req->termListAndStartPoint->term->u.general->buf =
                 odr_strdup(out, term);
             req->termListAndStartPoint->term->u.general->len = strlen(term);
-#if OCT_SIZE
-            req->termListAndStartPoint->term->u.general->size = strlen(term);
-#endif
         }
     }
     req->referenceId = set_refid(out);