diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-03-24 16:03:37 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-06-30 17:37:00 +0200 |
| commit | 5365cc8d310be80f425a861d52785baded341ea6 (patch) | |
| tree | 8061d57362b744ec56e9fb81da2cc3c66b7620e7 | |
| parent | 42375dd8936f546cb3e411efa1bc2e99ca4cb721 (diff) | |
| download | android-libiconv-5365cc8d310be80f425a861d52785baded341ea6.tar.gz android-libiconv-5365cc8d310be80f425a861d52785baded341ea6.tar.bz2 android-libiconv-5365cc8d310be80f425a861d52785baded341ea6.zip | |
Avoid a GCC warning.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/isoir165.h | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2012-03-24 Bruno Haible <bruno@clisp.org> + + Avoid a GCC warning. + * lib/isoir165.h (isoir165_mbtowc): Don't shadow the 'ret' variable. + 2012-01-26 Bruno Haible <bruno@clisp.org> Modernize quoting. diff --git a/lib/isoir165.h b/lib/isoir165.h index e3fde19..095ad45 100644 --- a/lib/isoir165.h +++ b/lib/isoir165.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001, 2005 Free Software Foundation, Inc. + * Copyright (C) 1999-2001, 2005, 2012 Free Software Foundation, Inc. * This file is part of the GNU LIBICONV Library. * * The GNU LIBICONV Library is free software; you can redistribute it @@ -107,7 +107,7 @@ isoir165_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) if (n >= 2) { unsigned char c2 = s[1]; if (c2 >= 0x21 && c2 < 0x7f) { - int ret = iso646_cn_mbtowc(conv,pwc,s+1,1); + ret = iso646_cn_mbtowc(conv,pwc,s+1,1); if (ret != 1) abort(); return 2; } |