X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fprt-ext.c;h=2f904f1d5a99dc66004cd43ebb68b717cf4f893f;hb=a7585fd1220c684189091e7fba2c5d6cf436031e;hp=6af7c6118a9c5b3d90fe7689b1dd7dbf8fd91a6a;hpb=633f1d5078e524d7f6cf6a1674821b5464f9fb76;p=yaz-moved-to-github.git diff --git a/src/prt-ext.c b/src/prt-ext.c index 6af7c61..2f904f1 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -216,8 +216,8 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) if (zclass == ODR_CONTEXT && tag == 1 && cons == 0) { /* we have an OCTET STRING. decode BER contents from it */ - const unsigned char *o_bp; - unsigned char *o_buf; + const char *o_bp; + char *o_buf; int o_size; char *voidp = 0; Odr_oct *oct; @@ -315,8 +315,8 @@ Z_External *z_ext_record_oid_nmem(NMEM nmem, const Odr_oid *oid, thisext->which = Z_External_sutrs; thisext->u.sutrs = sutrs; - sutrs->buf = (unsigned char *)nmem_malloc(nmem, len); - sutrs->len = sutrs->size = len; + sutrs->buf = (char *)nmem_malloc(nmem, len); + sutrs->len = len; memcpy(sutrs->buf, buf, len); } else @@ -325,11 +325,11 @@ Z_External *z_ext_record_oid_nmem(NMEM nmem, const Odr_oid *oid, if (!(thisext->u.octet_aligned = (Odr_oct *) nmem_malloc(nmem, sizeof(Odr_oct)))) return 0; - if (!(thisext->u.octet_aligned->buf = (unsigned char *) + if (!(thisext->u.octet_aligned->buf = (char *) nmem_malloc(nmem, len))) return 0; memcpy(thisext->u.octet_aligned->buf, buf, len); - thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = len; + thisext->u.octet_aligned->len = len; } return thisext; } @@ -356,12 +356,11 @@ Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, thisext->u.single_ASN1_type = (Odr_any *) odr_malloc(o, sizeof(Odr_any)); if (!thisext->u.single_ASN1_type) return 0; - thisext->u.single_ASN1_type->buf = (unsigned char *) odr_malloc(o, len); + thisext->u.single_ASN1_type->buf = (char *) odr_malloc(o, len); if (!thisext->u.single_ASN1_type->buf) return 0; memcpy(thisext->u.single_ASN1_type->buf, buf, len); - thisext->u.single_ASN1_type->len = thisext->u.single_ASN1_type->size = len; - + thisext->u.single_ASN1_type->len = len; return thisext; }