* util/grub-pe2elf.c (ehdr): Make static.

	(shdr): Likewise.
	(num_sections): Likewise.
	(offset): Likewise.

diff --git a/ChangeLog b/ChangeLog
index eba81c4c87a95bae1f6d5436295a21c4c5da1404..201b680dbf0c74db79b25beeaba96649bf54c5c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-pe2elf.c (ehdr): Make static.
+       (shdr): Likewise.
+       (num_sections): Likewise.
+       (offset): Likewise.
+
 2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Eliminate ofpath limits and possible overflows.

diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
index 51d41c9f0064c69c8d29e43e220ab8bdfdff16fb..730b9c12f160246358e8d32a270d89e983a16cc1 100644 (file)
--- a/util/grub-pe2elf.c
+++ b/util/grub-pe2elf.c
@@ -86,6 +86,8 @@ Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
 #define STRTAB_SECTION 9
 
 #define REL_SECTION    10
+
+/* 10 normal section + up to 4 relocation (.text, .rdata, .data, .symtab).  */
 #define MAX_SECTIONS    16
 
 #define STRTAB_BLOCK   256
@@ -93,10 +95,10 @@ Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
 static char *strtab;
 static int strtab_max, strtab_len;
 
-Elf32_Ehdr ehdr;
-Elf32_Shdr shdr[MAX_SECTIONS];
-int num_sections;
-grub_uint32_t offset;
+static Elf32_Ehdr ehdr;
+static Elf32_Shdr shdr[MAX_SECTIONS];
+static int num_sections;
+static grub_uint32_t offset;
 
 static int
 insert_string (const char *name)