X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fcharset-converter.cpp;h=6eb31c96310ec11505c1aa9007e6135bc481a747;hp=04457082669206366ea972760842321e857d0ef1;hb=36b087dfdcfd7d098d170ea72b29a1b0690032d2;hpb=d7f41f16caf965adb1a5ffcdaa937787dfcc030a

diff --git a/src/charset-converter.cpp b/src/charset-converter.cpp
index 0445708..6eb31c9 100644
--- a/src/charset-converter.cpp
+++ b/src/charset-converter.cpp
@@ -1,7 +1,5 @@
-/* $Id: charset-converter.cpp,v 1.4 2005-06-25 15:58:33 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
-
-This file is part of the yaz-proxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2009 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include <yaz/log.h>
 #include <yaz/proto.h>
@@ -33,7 +30,7 @@ Yaz_CharsetConverter::Yaz_CharsetConverter()
 
 Yaz_CharsetConverter::~Yaz_CharsetConverter()
 {
-    wrbuf_free(m_wrbuf, 1);
+    wrbuf_destroy(m_wrbuf);
     xfree(m_target_query_charset);
     xfree(m_client_query_charset);
 }
@@ -80,6 +77,7 @@ void Yaz_CharsetConverter::convert_type_1(char *buf_in, int len_in,
 {
     wrbuf_rewind(m_wrbuf);
     wrbuf_iconv_write(m_wrbuf, m_ct, buf_in, len_in);
+    wrbuf_iconv_reset(m_wrbuf, m_ct);
 
     *len_out = wrbuf_len(m_wrbuf);
     if (*len_out == 0)
@@ -149,6 +147,7 @@ void Yaz_CharsetConverter::convert_type_1(Z_RPNQuery *q, ODR o)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab