Correct const'ness and size'dness errors for 64 bits in apr-iconv sources.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-iconv/trunk@495070 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ces/iso-10646-ucs-4.c b/ces/iso-10646-ucs-4.c
index 36a4445..fb276d9 100644
--- a/ces/iso-10646-ucs-4.c
+++ b/ces/iso-10646-ucs-4.c
@@ -50,7 +50,7 @@
unsigned char **outbuf, apr_size_t *outbytesleft)
{
int *state = (int*)ces->data;
- int bytes;
+ apr_size_t bytes;
if (in == UCS_CHAR_NONE)
return 1; /* No state reinitialization for table charsets */
diff --git a/ces/ucs2-internal.c b/ces/ucs2-internal.c
index b0e2477..e305c8a 100644
--- a/ces/ucs2-internal.c
+++ b/ces/ucs2-internal.c
@@ -70,7 +70,7 @@
convert_to_ucs(struct iconv_ces *ces,
const unsigned char **inbuf, apr_size_t *inbytesleft)
{
- ucs2_t *ret = *inbuf;
+ const ucs2_t *ret = *inbuf;
if (*inbytesleft < sizeof(ucs2_t))
return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */
(*inbytesleft) -= sizeof(ucs2_t);
diff --git a/ces/ucs4-internal.c b/ces/ucs4-internal.c
index 178a091..34c8021 100644
--- a/ces/ucs4-internal.c
+++ b/ces/ucs4-internal.c
@@ -68,7 +68,7 @@
convert_to_ucs(struct iconv_ces *ces,
const unsigned char **inbuf, apr_size_t *inbytesleft)
{
- ucs4_t *ret = *inbuf;
+ const ucs4_t *ret = *inbuf;
if (*inbytesleft < sizeof(ucs4_t))
return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */
(*inbytesleft) -= sizeof(ucs4_t);
diff --git a/ces/unicode-1-1-utf-7.c b/ces/unicode-1-1-utf-7.c
index 14df87c..179712c 100644
--- a/ces/unicode-1-1-utf-7.c
+++ b/ces/unicode-1-1-utf-7.c
@@ -48,7 +48,7 @@
}
static APR_INLINE int
-lackofbytes(int bytes, apr_size_t *bytesleft)
+lackofbytes(apr_size_t bytes, apr_size_t *bytesleft)
{
if (bytes > *bytesleft)
return 1;
diff --git a/ces/utf-16.c b/ces/utf-16.c
index 4a001b5..ac10e63 100644
--- a/ces/utf-16.c
+++ b/ces/utf-16.c
@@ -49,7 +49,7 @@
{
unsigned char *cp;
int *state = (int *)ces->data;
- int bytes;
+ apr_size_t bytes;
if (in == UCS_CHAR_NONE)
return 1; /* No state reinitialization for table charsets */
diff --git a/ces/utf-8.c b/ces/utf-8.c
index 26d41f9..77c8951 100644
--- a/ces/utf-8.c
+++ b/ces/utf-8.c
@@ -51,7 +51,8 @@
unsigned char **outbuf, apr_size_t *outbytesleft)
{
unsigned char *cp;
- int n;
+ apr_size_t n;
+
if (in == UCS_CHAR_NONE)
return 1; /* No state reinitialization for table charsets */
if (in < 0x80) {
