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
Merge branch 'master' into yaz4
[yaz-moved-to-github.git]
/
src
/
siconv.c
diff --git
a/src/siconv.c
b/src/siconv.c
index
d7f066d
..
d3d9b89
100644
(file)
--- a/
src/siconv.c
+++ b/
src/siconv.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-27,7
+27,7
@@
#endif
#include <yaz/xmalloc.h>
#endif
#include <yaz/xmalloc.h>
-#include <yaz/nmem.h>
+#include <yaz/errno.h>
#include "iconv-p.h"
struct yaz_iconv_struct {
#include "iconv-p.h"
struct yaz_iconv_struct {
@@
-92,6
+92,8
@@
static int prepare_decoders(yaz_iconv_t cd, const char *tocode)
return 1;
if (yaz_wchar_decoder(tocode, &cd->decoder))
return 1;
return 1;
if (yaz_wchar_decoder(tocode, &cd->decoder))
return 1;
+ if (yaz_danmarc_decoder(tocode, &cd->decoder))
+ return 1;
return 0;
}
return 0;
}
@@
-306,7
+308,9
@@
void yaz_iconv_set_errno(yaz_iconv_t cd, int no)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+