Merge branch 'master' into sru_2_0

[yaz-moved-to-github.git] / util / yaz-illclient.c

diff --git a/util/yaz-illclient.c b/util/yaz-illclient.c
index 5cc39a8..c0383cb 100644 (file)
--- a/util/yaz-illclient.c
+++ b/util/yaz-illclient.c
@@ -364,12 +364,9 @@ ILL_Extension *makepromptextension(struct prog_args *args, ODR odr) {
     buf= odr_getbuf(odr_ext,&siz,0);
     ext->u.single_ASN1_type=(Odr_any *)
         odr_malloc(odr,sizeof(*ext->u.single_ASN1_type));
-    ext->u.single_ASN1_type->buf= (unsigned char *) odr_malloc(odr, siz);
+    ext->u.single_ASN1_type->buf= (char *) odr_malloc(odr, siz);
     memcpy(ext->u.single_ASN1_type->buf,buf, siz );
     ext->u.single_ASN1_type->len = siz;
-#if OCT_SIZE
-    ext->u.single_ASN1_type->size = siz;
-#endif
     odr_reset(odr_ext);
     odr_reset(odr_prt); /*!*/
 
@@ -383,12 +380,9 @@ ILL_Extension *makepromptextension(struct prog_args *args, ODR odr) {
     printf("External: \n");
     z_External(odr_prt, &ext,0,0);  /*!*/
     buf= odr_getbuf(odr_ext,&siz,0);
-    e->item->buf= (unsigned char *) odr_malloc(odr, siz);
+    e->item->buf= (char *) odr_malloc(odr, siz);
     memcpy(e->item->buf,buf, siz );
     e->item->len = siz;
-#if OCT_SIZE
-    e->item->size = siz;
-#endif
 
     odr_destroy(odr_prt);
     odr_destroy(odr_ext);
@@ -429,12 +423,9 @@ ILL_Extension *makeoclcextension(struct prog_args *args, ODR odr) {
     buf= odr_getbuf(odr_ext,&siz,0);
     ext->u.single_ASN1_type = (Odr_any*)
         odr_malloc(odr,sizeof(*ext->u.single_ASN1_type));
-    ext->u.single_ASN1_type->buf = (unsigned char *) odr_malloc(odr, siz);
+    ext->u.single_ASN1_type->buf = (char *) odr_malloc(odr, siz);
     memcpy(ext->u.single_ASN1_type->buf,buf, siz );
     ext->u.single_ASN1_type->len = siz;
-#if OCT_SIZE
-    ext->u.single_ASN1_type->size = siz;
-#endif
     odr_reset(odr_ext);
     odr_reset(odr_prt); /*!*/
 
@@ -448,12 +439,9 @@ ILL_Extension *makeoclcextension(struct prog_args *args, ODR odr) {
     printf("External: \n");
     z_External(odr_prt, &ext,0,0);  /*!*/
     buf= odr_getbuf(odr_ext,&siz,0);
-    e->item->buf= (unsigned char *) odr_malloc(odr, siz);
+    e->item->buf= (char *) odr_malloc(odr, siz);
     memcpy(e->item->buf, buf, siz);
     e->item->len = siz;
-#if OCT_SIZE
-    e->item->size = siz;
-#endif
 
     odr_destroy(odr_prt);
     odr_destroy(odr_ext);