X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=4a5ac25865946a974e341b7d80787d374e79f983;hb=a51cfbf3f8ca5c487fc8bbcecb4e456a08162a33;hp=c4b75ff7225b172975c545d19b587be5a3574e68;hpb=dc720b90d5ff1d5c5a1821de3a0e335eb64a1951;p=yaz-moved-to-github.git diff --git a/util/marcdump.c b/util/marcdump.c index c4b75ff..4a5ac25 100644 --- a/util/marcdump.c +++ b/util/marcdump.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: marcdump.c,v 1.49 2007-03-08 12:45:02 adam Exp $ + * $Id: marcdump.c,v 1.52 2007-04-17 20:26:18 adam Exp $ */ #define _FILE_OFFSET_BITS 64 @@ -90,8 +90,8 @@ static void marcdump_read_line(yaz_marc_t mt, const char *fname) { WRBUF wrbuf = wrbuf_alloc(); yaz_marc_write_mode(mt, wrbuf); - fputs(wrbuf_buf(wrbuf), stdout); - wrbuf_free(wrbuf, 1); + fputs(wrbuf_cstr(wrbuf), stdout); + wrbuf_destroy(wrbuf); } fclose(inf); } @@ -116,9 +116,9 @@ static void marcdump_read_xml(yaz_marc_t mt, const char *fname) { yaz_marc_write_mode(mt, wrbuf); - fputs(wrbuf_buf(wrbuf), stdout); + fputs(wrbuf_cstr(wrbuf), stdout); } - wrbuf_free(wrbuf, 1); + wrbuf_destroy(wrbuf); } xmlFreeDoc(doc); } @@ -181,10 +181,10 @@ static void dump(const char *fname, const char *from, const char *to, fprintf (cfile, "char *marc_records[] = {\n"); for(;; marc_no++) { - char *result = 0; + const char *result = 0; size_t len; size_t rlen; - int len_result; + size_t len_result; size_t r; char buf[100001]; @@ -274,7 +274,7 @@ static void dump(const char *fname, const char *from, const char *to, fclose(sf); } } - len_result = (int) rlen; + len_result = rlen; r = yaz_marc_decode_buf(mt, buf, -1, &result, &len_result); if (r > 0 && result) { @@ -327,7 +327,7 @@ int main (int argc, char **argv) const char *split_fname = 0; const char *leader_spec = 0; int write_using_libxml2 = 0; - + #if HAVE_LOCALE_H setlocale(LC_CTYPE, ""); #endif