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
Document s=ag
[yaz-moved-to-github.git]
/
src
/
odr_oct.c
diff --git
a/src/odr_oct.c
b/src/odr_oct.c
index
c4ef168
..
21fe3d2
100644
(file)
--- a/
src/odr_oct.c
+++ b/
src/odr_oct.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.12 2007-05-02 11:31:59 adam Exp $
*/
/**
* \file odr_oct.c
*/
/**
* \file odr_oct.c
@@
-198,6
+196,13
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
odr_seterror(o, ODATA, 45);
return 0;
}
odr_seterror(o, ODATA, 45);
return 0;
}
+ ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+ &outbuf, &outleft);
+ if (ret == (size_t)(-1))
+ {
+ odr_seterror(o, ODATA, 45);
+ return 0;
+ }
inleft = outbuf - (char*) *p;
(*p)[inleft] = '\0'; /* null terminate it */
inleft = outbuf - (char*) *p;
(*p)[inleft] = '\0'; /* null terminate it */
@@
-213,6
+218,7
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
/*
* 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