projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use LONGLONG rather than ULONGLONG on Windows to support good'old
[yaz-moved-to-github.git]
/
src
/
record_conv.c
diff --git
a/src/record_conv.c
b/src/record_conv.c
index
bf148e9
..
524171e
100644
(file)
--- 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.
*
* See the file LICENSE for details.
*
- * $Id: record_conv.c,v 1.12 2006-12-12 10:41:38 marc Exp $
+ * $Id: record_conv.c,v 1.16 2007-05-06 20:12:20 adam Exp $
*/
/**
* \file record_conv.c
*/
/**
* \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 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;
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);
{
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);
}
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)
{
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;
r->which = type;
r->next = 0;
*p->rules_p = r;
@@
-339,10
+340,8
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
return 0;
}
return 0;
}
-int yaz_record_conv_configure(yaz_record_conv_t p, const void *ptr_v)
+int yaz_record_conv_configure(yaz_record_conv_t p, const xmlNode *ptr)
{
{
- const xmlNode *ptr = ptr_v;
-
yaz_record_conv_reset(p);
/* parsing element children */
yaz_record_conv_reset(p);
/* parsing element children */
@@
-486,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)
{
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)
}
void yaz_record_conv_set_path(yaz_record_conv_t p, const char *path)