From 62244f7210302bf7608c6130185c17d3d2e714e0 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Wed, 24 May 2000 18:26:40 +0000 Subject: use size_t for arguments to iconv, not int. Fixes 64 bit platforms. 2000-05-24 Matt Wilson * modules/basic/basic.c (conv_8bit): use size_t for arguments to iconv, not int. Fixes 64 bit platforms. * modules/basic/basic.c (conv_euc): likewise --- ChangeLog | 7 +++++++ ChangeLog.pre-1-0 | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-2 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ modules/basic/basic-x.c | 8 ++++---- modules/basic/basic.c | 8 ++++---- 9 files changed, 57 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 576b5877..db4e1bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 576b5877..db4e1bcf 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +2000-05-24 Matt Wilson + + * modules/basic/basic.c (conv_8bit): use size_t for arguments to + iconv, not int. Fixes 64 bit platforms. + + * modules/basic/basic.c (conv_euc): likewise + Mon May 22 18:19:32 2000 Owen Taylor * pango/pango-layout.c (process_item): Fix <, <= confusion. diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c index e78aa384..0be1ea14 100644 --- a/modules/basic/basic-x.c +++ b/modules/basic/basic-x.c @@ -270,9 +270,9 @@ conv_8bit (CharCache *cache, const char *p; const char *inptr = input; - int inbytesleft; + size_t inbytesleft; char *outptr = &outbuf; - int outbytesleft = 1; + size_t outbytesleft = 1; _pango_utf8_iterate (input, &p, NULL); inbytesleft = p - input; @@ -294,9 +294,9 @@ conv_euc (CharCache *cache, const char *p; const char *inptr = input; - int inbytesleft; + size_t inbytesleft; char *outptr = outbuf; - int outbytesleft = 2; + size_t outbytesleft = 2; _pango_utf8_iterate (input, &p, NULL); inbytesleft = p - input; diff --git a/modules/basic/basic.c b/modules/basic/basic.c index e78aa384..0be1ea14 100644 --- a/modules/basic/basic.c +++ b/modules/basic/basic.c @@ -270,9 +270,9 @@ conv_8bit (CharCache *cache, const char *p; const char *inptr = input; - int inbytesleft; + size_t inbytesleft; char *outptr = &outbuf; - int outbytesleft = 1; + size_t outbytesleft = 1; _pango_utf8_iterate (input, &p, NULL); inbytesleft = p - input; @@ -294,9 +294,9 @@ conv_euc (CharCache *cache, const char *p; const char *inptr = input; - int inbytesleft; + size_t inbytesleft; char *outptr = outbuf; - int outbytesleft = 2; + size_t outbytesleft = 2; _pango_utf8_iterate (input, &p, NULL); inbytesleft = p - input; -- cgit v1.2.1