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
Added yaz_errno
[yaz-moved-to-github.git]
/
odr
/
odr_oct.c
diff --git
a/odr/odr_oct.c
b/odr/odr_oct.c
index
008aaa1
..
204648c
100644
(file)
--- a/
odr/odr_oct.c
+++ b/
odr/odr_oct.c
@@
-3,7
+3,7
@@
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: odr_oct.c,v 1.17 2002-07-25 12:51:08 adam Exp $
+ * $Id: odr_oct.c,v 1.18 2002-08-28 07:53:51 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-137,8
+137,8
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
if (o->direction == ODR_ENCODE)
{
t->buf = 0;
if (o->direction == ODR_ENCODE)
{
t->buf = 0;
-#if HAVE_ICONV_H
- if (o->op->iconv_handle != (iconv_t)(-1))
+
+ if (o->op->iconv_handle != 0)
{
size_t inleft = strlen(*p);
char *inbuf = *p;
{
size_t inleft = strlen(*p);
char *inbuf = *p;
@@
-148,8
+148,8
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
t->buf = outbuf;
t->buf = outbuf;
- ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
- &outbuf, &outleft);
+ ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
+ &outbuf, &outleft);
if (ret == (size_t)(-1))
{
o->error = ODATA;
if (ret == (size_t)(-1))
{
o->error = ODATA;
@@
-157,7
+157,6
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
}
t->size = t->len = outbuf - (char*) t->buf;
}
}
t->size = t->len = outbuf - (char*) t->buf;
}
-#endif
if (!t->buf)
{
t->buf = (unsigned char *) *p;
if (!t->buf)
{
t->buf = (unsigned char *) *p;
@@
-175,8
+174,8
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
if (o->direction == ODR_DECODE)
{
*p = 0;
if (o->direction == ODR_DECODE)
{
*p = 0;
-#if HAVE_ICONV_H
- if (o->op->iconv_handle != (iconv_t)(-1))
+
+ if (o->op->iconv_handle != 0)
{
size_t inleft = t->len;
char *inbuf = t->buf;
{
size_t inleft = t->len;
char *inbuf = t->buf;
@@
-186,8
+185,8
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
*p = outbuf;
*p = outbuf;
- ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
- &outbuf, &outleft);
+ ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
+ &outbuf, &outleft);
if (ret == (size_t)(-1))
{
o->error = ODATA;
if (ret == (size_t)(-1))
{
o->error = ODATA;
@@
-197,7
+196,6
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
(*p)[inleft] = '\0'; /* null terminate it */
}
(*p)[inleft] = '\0'; /* null terminate it */
}
-#endif
if (!*p)
{
*p = (char *) t->buf;
if (!*p)
{
*p = (char *) t->buf;