/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
/*
* The table below should be moved to the ODR structure itself and
* be an image of the association context: To help
- * map indirect references when they show up.
+ * map indirect references when they show up.
*/
static Z_ext_typeent type_table[] =
{
encoding CHOICE {
single-ASN1-type [0] ABSTRACT_SYNTAX.&Type,
octet-aligned [1] IMPLICIT OCTET STRING,
- arbitrary [2] IMPLICIT BIT STRING
+ arbitrary [2] IMPLICIT BIT STRING
}
}
</pre>
return 0;
/* Save our decoding ODR members */
- o_bp = o->bp;
+ o_bp = o->bp;
o_buf = o->buf;
o_size = o->size;
r = (*type->fun)(o, &voidp, 0, 0);
(*p)->which = type->what;
(*p)->u.single_ASN1_type = (Odr_any*) voidp;
-
+
/* Restore our decoding ODR member */
- o->bp = o_bp;
+ o->bp = o_bp;
o->buf = o_buf;
o->size = o_size;
return r && odr_sequence_end(o);
}
if (zclass == ODR_CONTEXT && tag == 0 && cons == 1)
- {
+ {
/* It's single ASN.1 type, bias the CHOICE. */
odr_choice_bias(o, type->what);
}
odr_sequence_end(o);
}
-Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len)
+Z_External *z_ext_record_oid_nmem(NMEM nmem, const Odr_oid *oid,
+ const char *buf, int len)
{
Z_External *thisext;
if (!oid)
return 0;
- thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
+ thisext = (Z_External *) nmem_malloc(nmem, sizeof(*thisext));
thisext->descriptor = 0;
thisext->indirect_reference = 0;
- thisext->direct_reference = odr_oiddup(o, oid);
+ thisext->direct_reference = odr_oiddup_nmem(nmem, oid);
if (len < 0) /* Structured data */
{
}
else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{ /* SUTRS is a single-ASN.1-type */
- Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs));
-
+ Odr_oct *sutrs = (Odr_oct *)nmem_malloc(nmem, sizeof(*sutrs));
+
thisext->which = Z_External_sutrs;
thisext->u.sutrs = sutrs;
- sutrs->buf = (unsigned char *)odr_malloc(o, len);
+ sutrs->buf = (unsigned char *)nmem_malloc(nmem, len);
sutrs->len = sutrs->size = len;
memcpy(sutrs->buf, buf, len);
}
{
thisext->which = Z_External_octet;
if (!(thisext->u.octet_aligned = (Odr_oct *)
- odr_malloc(o, sizeof(Odr_oct))))
+ nmem_malloc(nmem, sizeof(Odr_oct))))
return 0;
if (!(thisext->u.octet_aligned->buf = (unsigned char *)
- odr_malloc(o, len)))
+ 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;
return thisext;
}
+Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid,
+ const char *buf, int len)
+{
+ return z_ext_record_oid_nmem(o->mem, oid, buf, len);
+}
+
Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid,
const char *buf, int len)
{