X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fyaz-illclient.c;h=b6dd6beca15d8c7737f0a022ad07d65f08f0d5f2;hp=546e60bb4b5ab9e2204ff79ba4afb2a685bdd42c;hb=69b1d8e7b437179163fe97b7cbead51a56835f2a;hpb=5242cb5a8634bfa38b9333ff7f903e718ac6e292 diff --git a/util/yaz-illclient.c b/util/yaz-illclient.c index 546e60b..b6dd6be 100644 --- a/util/yaz-illclient.c +++ b/util/yaz-illclient.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2012 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -364,9 +364,12 @@ 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 = ext->u.single_ASN1_type->size = 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); /*!*/ @@ -380,9 +383,12 @@ 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 = e->item->size = siz; + e->item->len = siz; +#if OCT_SIZE + e->item->size = siz; +#endif odr_destroy(odr_prt); odr_destroy(odr_ext); @@ -423,9 +429,12 @@ 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 = ext->u.single_ASN1_type->size = 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); /*!*/ @@ -439,9 +448,12 @@ 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 = e->item->size = siz; + e->item->len = siz; +#if OCT_SIZE + e->item->size = siz; +#endif odr_destroy(odr_prt); odr_destroy(odr_ext);