X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord_conv.c;h=524171efe91c7cef67cc49af82ab5263e0ca7be8;hb=3b792849c676d96918850e2f1e0af87a75278501;hp=086eec50d3f857a5f13d86faecd5a8b2efac2902;hpb=8f8560e0ab3b370263683d8aea81b839c5927091;p=yaz-moved-to-github.git

diff --git a/src/record_conv.c b/src/record_conv.c
index 086eec5..524171e 100644
--- a/src/record_conv.c
+++ b/src/record_conv.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2005-2006, Index Data ApS
+ * Copyright (C) 2005-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: record_conv.c,v 1.13 2006-12-13 11:25:17 adam Exp $
+ * $Id: record_conv.c,v 1.16 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file record_conv.c
@@ -107,7 +107,7 @@ static void yaz_record_conv_reset(yaz_record_conv_t p)
 
 yaz_record_conv_t yaz_record_conv_create()
 {
-    yaz_record_conv_t p = xmalloc(sizeof(*p));
+    yaz_record_conv_t p = (yaz_record_conv_t) xmalloc(sizeof(*p));
     p->nmem = nmem_create();
     p->wr_error = wrbuf_alloc();
     p->rules = 0;
@@ -126,7 +126,7 @@ void yaz_record_conv_destroy(yaz_record_conv_t p)
     {
         yaz_record_conv_reset(p);
         nmem_destroy(p->nmem);
-        wrbuf_free(p->wr_error, 1);
+        wrbuf_destroy(p->wr_error);
         xfree(p->path);
         xfree(p);
     }
@@ -136,7 +136,8 @@ void yaz_record_conv_destroy(yaz_record_conv_t p)
 static struct yaz_record_conv_rule *add_rule(yaz_record_conv_t p,
                                              enum YAZ_RECORD_CONV_RULE type)
 {
-    struct yaz_record_conv_rule *r = nmem_malloc(p->nmem, sizeof(*r));
+    struct yaz_record_conv_rule *r = (struct yaz_record_conv_rule *)
+        nmem_malloc(p->nmem, sizeof(*r));
     r->which = type;
     r->next = 0;
     *p->rules_p = r;
@@ -484,7 +485,7 @@ int yaz_record_conv_record(yaz_record_conv_t p,
 
 const char *yaz_record_conv_get_error(yaz_record_conv_t p)
 {
-    return wrbuf_buf(p->wr_error);
+    return wrbuf_cstr(p->wr_error);
 }
 
 void yaz_record_conv_set_path(yaz_record_conv_t p, const char *path)