X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=a0f34e18659df4e5bdb7d5b26f19b28561ea55ef;hb=53a07fe60bdd9837041cd6f0988b38f5c38c73e0;hp=084b632919430929d8a0731345812b9c81fe2fe3;hpb=cf9f213fff1ae6b2471f8367114b93ae45ed8b75;p=yaz-moved-to-github.git diff --git a/odr/odr.c b/odr/odr.c index 084b632..a0f34e1 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: odr.c,v 1.36 2002-08-28 07:53:51 adam Exp $ + * $Id: odr.c,v 1.38 2002-09-24 08:05:41 adam Exp $ * */ #if HAVE_CONFIG_H @@ -63,7 +63,7 @@ int odr_set_charset(ODR o, const char *to, const char *from) if (o->op->iconv_handle) yaz_iconv_close (o->op->iconv_handle); - o->op->iconv_handle = iconv_open (to, from); + o->op->iconv_handle = yaz_iconv_open (to, from); if (o->op->iconv_handle == 0) return -1; return 0; @@ -84,7 +84,7 @@ ODR odr_createmem(int direction) r->can_grow = 1; r->mem = nmem_create(); r->enable_bias = 1; - r->op = xmalloc (sizeof(*r->op)); + r->op = (struct Odr_private *) xmalloc (sizeof(*r->op)); r->op->odr_ber_tag.lclass = -1; r->op->iconv_handle = 0; odr_reset(r);