X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_read.c;h=4a96ec30eb4f5a3413397ff3eda4a065d9dd6ab7;hb=a9e90f22d2cefbafc9d490a03a3bc7d1b75d57ee;hp=f169487ba88adee508d361ab4a63cb6fefec1ca8;hpb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;p=idzebra-moved-to-github.git diff --git a/data1/d1_read.c b/data1/d1_read.c index f169487..4a96ec3 100644 --- a/data1/d1_read.c +++ b/data1/d1_read.c @@ -1,6 +1,6 @@ -/* $Id: d1_read.c,v 1.13 2004-12-13 20:51:28 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: d1_read.c,v 1.15 2005-01-17 22:12:34 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -1108,12 +1108,15 @@ int data1_iconv (data1_handle dh, NMEM m, data1_node *n, if (yaz_matchstr (tocode, fromcode)) { WRBUF wrbuf = wrbuf_alloc(); - yaz_iconv_t t = yaz_iconv_open (tocode, fromcode); + yaz_iconv_t t = yaz_iconv_open(tocode, fromcode); if (!t) + { + wrbuf_free(wrbuf, 1); return -1; - data1_iconv_s (dh, m, n, t, wrbuf, tocode); - yaz_iconv_close (t); - wrbuf_free (wrbuf, 1); + } + data1_iconv_s(dh, m, n, t, wrbuf, tocode); + yaz_iconv_close(t); + wrbuf_free(wrbuf, 1); } return 0; }