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
Bundle sha1 rather than use libgcrypt/nettle
[yaz-moved-to-github.git]
/
src
/
iconv_encode_wchar.c
diff --git
a/src/iconv_encode_wchar.c
b/src/iconv_encode_wchar.c
index
41b4492
..
191a907
100644
(file)
--- a/
src/iconv_encode_wchar.c
+++ b/
src/iconv_encode_wchar.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-14,7
+14,6
@@
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include <string.h>
-#include <ctype.h>
#if HAVE_WCHAR_H
#include <wchar.h>
#endif
#if HAVE_WCHAR_H
#include <wchar.h>
#endif
@@
-53,7
+52,7
@@
static size_t write_wchar_t(yaz_iconv_t cd, yaz_iconv_encoder_t en,
yaz_iconv_encoder_t yaz_wchar_encoder(const char *tocode,
yaz_iconv_encoder_t e)
yaz_iconv_encoder_t yaz_wchar_encoder(const char *tocode,
yaz_iconv_encoder_t e)
-
+
{
#if HAVE_WCHAR_H
if (!yaz_matchstr(tocode, "wchar_t"))
{
#if HAVE_WCHAR_H
if (!yaz_matchstr(tocode, "wchar_t"))
@@
-71,7
+70,7
@@
static unsigned long read_wchar_t(yaz_iconv_t cd, yaz_iconv_decoder_t d,
size_t inbytesleft, size_t *no_read)
{
unsigned long x = 0;
size_t inbytesleft, size_t *no_read)
{
unsigned long x = 0;
-
+
if (inbytesleft < sizeof(wchar_t))
{
yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL); /* incomplete input */
if (inbytesleft < sizeof(wchar_t))
{
yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL); /* incomplete input */
@@
-90,7
+89,7
@@
static unsigned long read_wchar_t(yaz_iconv_t cd, yaz_iconv_decoder_t d,
yaz_iconv_decoder_t yaz_wchar_decoder(const char *fromcode,
yaz_iconv_decoder_t d)
yaz_iconv_decoder_t yaz_wchar_decoder(const char *fromcode,
yaz_iconv_decoder_t d)
-
+
{
#if HAVE_WCHAR_H
if (!yaz_matchstr(fromcode, "wchar_t"))
{
#if HAVE_WCHAR_H
if (!yaz_matchstr(fromcode, "wchar_t"))