gdbarch: add instruction predicate methods

[deliverable/binutils-gdb.git] / bfd / peXXigen.c

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index 843cae8ff3b596efe6cec3322b89514d5546a213..1da5a9a9869f27e6f87f45d180fe9c2ff9530769 100644 (file)
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2981,7 +2981,6 @@ static signed int
 rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
 {
   signed int    res;
-  unsigned int  i;
   bfd_byte *    astring;
   unsigned int  alen;
   bfd_byte *    bstring;
@@ -3013,24 +3012,26 @@ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
                 min (alen, blen));
 
 #elif defined HAVE_WCHAR_H
-  res = 0;
-  for (i = min (alen, blen); i--; astring += 2, bstring += 2)
-    {
-      wchar_t awc;
-      wchar_t bwc;
-
-      /* Convert UTF-16 unicode characters into wchar_t characters so
-        that we can then perform a case insensitive comparison.  */
-      int Alen = u16_mbtouc (& awc, (const unsigned short *) astring, 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;
-    }
-
+  {
+    unsigned int  i;
+    res = 0;
+    for (i = min (alen, blen); i--; astring += 2, bstring += 2)
+      {
+       wchar_t awc;
+       wchar_t bwc;
+
+       /* Convert UTF-16 unicode characters into wchar_t characters so
+          that we can then perform a case insensitive comparison.  */
+       int Alen = u16_mbtouc (& awc, (const unsigned short *) astring, 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;
+      }
+  }
 #else
   /* Do the best we can - a case sensitive, untranslated comparison.  */
   res = memcmp (astring, bstring, min (alen, blen) * 2);
@@ -3540,7 +3541,7 @@ rsrc_process_section (bfd * abfd,
        }
 
       /* Align the data pointer - we assume 1^2 alignment.  */
-      data = (bfd_byte *) (((long) (data + 3)) & ~ 3);
+      data = (bfd_byte *) (((ptrdiff_t) (data + 3)) & ~ 3);
       rva_bias += data - p;
 
       if (data == (dataend - 4))
@@ -3568,7 +3569,7 @@ rsrc_process_section (bfd * abfd,
 
       data = rsrc_parse_directory (abfd, type_tables + indx, data, data,
                                   dataend, rva_bias, NULL);
-      data = (bfd_byte *) (((long) (data + 3)) & ~ 3);
+      data = (bfd_byte *) (((ptrdiff_t) (data + 3)) & ~ 3);
       rva_bias += data - p;
       if (data == (dataend - 4))
        data = dataend;