espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix indentation issue and reorganize last commit entry

Browse Source 
so that it is shorter than 80.
  peXXigen.c (rsrc_cmp): Fix unused variable warning.
This commit is contained in:
Pierre Muller
2013-12-19 14:00:11 +01:00
parent 12e8c7d7c2
commit 3f10b67a59
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,7 +1,11 @@
2013-12-19 Pierre Muller <muller@sourceware.org> 2013-12-19 Pierre Muller <muller@sourceware.org>
* peXXigen.c (u16_mbtouc): Avoid unused function warning by excluding if * peXXigen.c (rsrc_cmp): Fix unused variable warning.
__CYGWIN__ or __MINGW32__ macro is defined.
2013-12-19 Pierre Muller <muller@sourceware.org>
* peXXigen.c (u16_mbtouc): Avoid unused function warning by excluding
if __CYGWIN__ or __MINGW32__ macro is defined.
(rsrc_cmp): Fix Windows host version and version without wchar header. (rsrc_cmp): Fix Windows host version and version without wchar header.
[__CYGWIN__, __MINGW32__]: Introduce rsrccmp macro. [__CYGWIN__, __MINGW32__]: Introduce rsrccmp macro.
Fix coding standard issues. Fix coding standard issues.

35
bfd/peXXigen.c
View File

@ -2981,7 +2981,6 @@ static signed int
rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
{ {
signed int res; signed int res;
unsigned int i;
bfd_byte * astring; bfd_byte * astring;
unsigned int alen; unsigned int alen;
bfd_byte * bstring; bfd_byte * bstring;
@ -3013,24 +3012,26 @@ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
min (alen, blen)); min (alen, blen));
#elif defined HAVE_WCHAR_H #elif defined HAVE_WCHAR_H
res = 0; {
for (i = min (alen, blen); i--; astring += 2, bstring += 2) unsigned int i;
{ res = 0;
wchar_t awc; for (i = min (alen, blen); i--; astring += 2, bstring += 2)
wchar_t bwc; {
wchar_t awc;
wchar_t bwc;
/* Convert UTF-16 unicode characters into wchar_t characters so /* Convert UTF-16 unicode characters into wchar_t characters so
that we can then perform a case insensitive comparison. */ that we can then perform a case insensitive comparison. */
int Alen = u16_mbtouc (& awc, (const unsigned short *) astring, 2); int Alen = u16_mbtouc (& awc, (const unsigned short *) astring, 2);
int Blen = u16_mbtouc (& bwc, (const unsigned short *) bstring, 2); int Blen = u16_mbtouc (& bwc, (const unsigned short *) bstring, 2);
if (Alen != Blen)
return Alen - Blen;
res = wcsncasecmp (& awc, & bwc, 1);
if (res)
break;
}
if (Alen != Blen)
return Alen - Blen;
res = wcsncasecmp (& awc, & bwc, 1);
if (res)
break;
}
}
#else #else
/* Do the best we can - a case sensitive, untranslated comparison. */ /* Do the best we can - a case sensitive, untranslated comparison. */
res = memcmp (astring, bstring, min (alen, blen) * 2); res = memcmp (astring, bstring, min (alen, blen) * 2);