WRBUF updates

diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp
index 4570ac5..472ec9a 100644 (file)
--- a/src/filter_record_transform.cpp
+++ b/src/filter_record_transform.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_record_transform.cpp,v 1.8 2007-01-25 14:05:54 adam Exp $
+/* $Id: filter_record_transform.cpp,v 1.9 2007-03-20 07:57:54 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
@@ -299,7 +299,7 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const
                                  YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
                                  yaz_record_conv_get_error(rc));
                      }
-                     wrbuf_free(output_record, 1);
+                     wrbuf_destroy(output_record);
                  }
              }
          }

diff --git a/src/gduutil.cpp b/src/gduutil.cpp
index 4d02d2d..e0b971f 100644 (file)
--- a/src/gduutil.cpp
+++ b/src/gduutil.cpp
@@ -1,4 +1,4 @@
-/* $Id: gduutil.cpp,v 1.17 2007-01-25 14:05:54 adam Exp $
+/* $Id: gduutil.cpp,v 1.18 2007-03-20 07:57:54 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
@@ -182,8 +182,8 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
                          
             WRBUF wr = wrbuf_alloc();
             yaz_query_to_wrbuf(wr, sr->query);
-            os << wrbuf_buf(wr);
-            wrbuf_free(wr, 1);
+            os << wrbuf_cstr(wr);
+            wrbuf_destroy(wr);
         }
         break;
     case Z_APDU_searchResponse:
@@ -336,8 +336,8 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
                 {
                     WRBUF wr = wrbuf_alloc();
                     yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE);
-                    os << wrbuf_buf(wr);
-                    wrbuf_free(wr, 1);
+                    os << wrbuf_cstr(wr);
+                    wrbuf_destroy(wr);
                 }
                 else
                     os << " -";

diff --git a/src/util.cpp b/src/util.cpp
index cf9a6a0..64fd0b8 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-/* $Id: util.cpp,v 1.25 2007-01-25 14:05:54 adam Exp $
+/* $Id: util.cpp,v 1.26 2007-03-20 07:57:54 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
@@ -215,7 +215,7 @@ std::string mp_util::zQueryToString(Z_Query *query)
             query_str = std::string(wrbuf_buf(w), wrbuf_len(w));
             
             // destroy wrbuf
-            wrbuf_free(w, 1);
+            wrbuf_destroy(w);
         }
     }