* grub-core/bus/usb/usb.c (attach_hooks): Make static.

	* grub-core/bus/usb/usbhub.c (hubs): Likewise.
	* grub-core/commands/hashsum.c (aliases): Likewise.
	* grub-core/commands/setpci.c (pci_registers): Likewise.
	* grub-core/disk/usbms.c (attach_hook): Likewise.
	* grub-core/fs/zfs/zfs.c (decomp_table): Likewise.
	(zio_checksum_table): Likewise.
	* grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise.
	* grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise.
	* grub-core/lib/legacy_parse.c (legacy_commands): Likewise.
	* grub-core/lib/relocator.c (leftovers): Likewise.
	(extra_blocks): Likewise.
	* grub-core/loader/i386/bsd.c (relocator): Likewise.
	* grub-core/loader/i386/multiboot_mbi.c (modules): Likewise.
	(modules_last): Likewise.
	* grub-core/loader/i386/xnu.c (table_aliases): Likewise.
	(devices): Likewise.
	* grub-core/loader/multiboot_mbi2.c (modules): Likewise.
	(modules_last): Likewise.
	* grub-core/normal/auth.c (users): Likewise.
	* grub-core/normal/context.c (initial_menu): Likewise.
	(current_menu): Likewise.
	* grub-core/normal/crypto.c (crypto_specs): Likewise.
	* grub-core/term/serial.c (grub_serial_ports): Likewise.
	(grub_serial_terminfo_input_template): Likewise.
	(grub_serial_terminfo_output_template): Likewise.
	(grub_serial_terminfo_input): Likewise.
	(grub_serial_terminfo_output): Likewise.
	(registered): Likewise.
	* grub-core/term/usb_keyboard.c (attach_hook): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 20fdfc86c5d51612db1302ced251788191da439b..9527a6e8e84046e602f48d3e294012b4e1acc688 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/bus/usb/usb.c (attach_hooks): Make static.
+       * grub-core/bus/usb/usbhub.c (hubs): Likewise.
+       * grub-core/commands/hashsum.c (aliases): Likewise.
+       * grub-core/commands/setpci.c (pci_registers): Likewise.
+       * grub-core/disk/usbms.c (attach_hook): Likewise.
+       * grub-core/fs/zfs/zfs.c (decomp_table): Likewise.
+       (zio_checksum_table): Likewise.
+       * grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise.
+       * grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise.
+       * grub-core/lib/legacy_parse.c (legacy_commands): Likewise.
+       * grub-core/lib/relocator.c (leftovers): Likewise.
+       (extra_blocks): Likewise.
+       * grub-core/loader/i386/bsd.c (relocator): Likewise.
+       * grub-core/loader/i386/multiboot_mbi.c (modules): Likewise.
+       (modules_last): Likewise.
+       * grub-core/loader/i386/xnu.c (table_aliases): Likewise.
+       (devices): Likewise.
+       * grub-core/loader/multiboot_mbi2.c (modules): Likewise.
+       (modules_last): Likewise.
+       * grub-core/normal/auth.c (users): Likewise.
+       * grub-core/normal/context.c (initial_menu): Likewise.
+       (current_menu): Likewise.
+       * grub-core/normal/crypto.c (crypto_specs): Likewise.
+       * grub-core/term/serial.c (grub_serial_ports): Likewise.
+       (grub_serial_terminfo_input_template): Likewise.
+       (grub_serial_terminfo_output_template): Likewise.
+       (grub_serial_terminfo_input): Likewise.
+       (grub_serial_terminfo_output): Likewise.
+       (registered): Likewise.
+       * grub-core/term/usb_keyboard.c (attach_hook): Likewise.
+
 2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/video/bochs.c (grub_video_bochs_setup): Use

diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c
index 2bd805ef24c673d6648e17dad280ef69b77e73ea..70173b7ea8ee594aa4bc440a9269a135a6ef4266 100644 (file)
--- a/grub-core/bus/usb/usb.c
+++ b/grub-core/bus/usb/usb.c
@@ -25,7 +25,7 @@
 #include <grub/term.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
-struct grub_usb_attach_desc *attach_hooks;
+static struct grub_usb_attach_desc *attach_hooks;
 
 void
 grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)

diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
index f08910d2b3fac9b2e1338e14d320e83f1448692e..492be914c9e454bb27e206271029bbd535fac232 100644 (file)
--- a/grub-core/bus/usb/usbhub.c
+++ b/grub-core/bus/usb/usbhub.c
@@ -39,7 +39,7 @@ struct grub_usb_hub
   grub_usb_device_t dev;
 };
 
-struct grub_usb_hub *hubs;
+static struct grub_usb_hub *hubs;
 
 /* Add a device that currently has device number 0 and resides on
    CONTROLLER, the Hub reported that the device speed is SPEED.  */

diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
index 8b6806e45620ca3618ccc0498d1c2876e326aef9..664fe9c247c6fd02ad487ff508738f488a362110 100644 (file)
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -36,7 +36,7 @@ static const struct grub_arg_option options[] = {
   {0, 0, 0, 0, 0, 0}
 };
 
-struct { const char *name; const char *hashname; } aliases[] = 
+static struct { const char *name; const char *hashname; } aliases[] = 
   {
     {"sha256sum", "sha256"},
     {"sha512sum", "sha512"},

diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c
index 7b194ed173d15635921c39de819a8cbe469ab69d..88dfa4c08d529175efdb5df588b7099d1a55a5b9 100644 (file)
--- a/grub-core/commands/setpci.c
+++ b/grub-core/commands/setpci.c
@@ -32,7 +32,7 @@ struct pci_register
   unsigned size;
 };
 
-struct pci_register pci_registers[] =
+static struct pci_register pci_registers[] =
   {
     {"VENDOR_ID",       GRUB_PCI_REG_VENDOR      , 2},
     {"DEVICE_ID",       GRUB_PCI_REG_DEVICE      , 2},

diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c
index e63105ccc645d3d6b29688fd538f335d8d12b023..2e5d2459ae55931ff1bd866a2e139946c5618d9b 100644 (file)
--- a/grub-core/disk/usbms.c
+++ b/grub-core/disk/usbms.c
@@ -408,7 +408,7 @@ static struct grub_scsi_dev grub_usbms_dev =
     .write = grub_usbms_write
   };
 
-struct grub_usb_attach_desc attach_hook =
+static struct grub_usb_attach_desc attach_hook =
 {
   .class = GRUB_USB_CLASS_MASS_STORAGE,
   .hook = grub_usbms_attach

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index 3a94d88742d23e844a2b6d6fbb01855d3ba09ddc..8e83ea0b51426ef63cb6f76c38557053ee45e076 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -161,7 +161,7 @@ struct grub_zfs_data
   grub_disk_addr_t vdev_phys_sector;
 };
 
-decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
+static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
   {"inherit", NULL},           /* ZIO_COMPRESS_INHERIT */
   {"on", lzjb_decompress},     /* ZIO_COMPRESS_ON */
   {"off", NULL},               /* ZIO_COMPRESS_OFF */
@@ -201,7 +201,7 @@ zio_checksum_off (const void *buf __attribute__ ((unused)),
 }
 
 /* Checksum Table and Values */
-zio_checksum_info_t zio_checksum_table[ZIO_CHECKSUM_FUNCTIONS] = {
+static zio_checksum_info_t zio_checksum_table[ZIO_CHECKSUM_FUNCTIONS] = {
   {NULL, 0, 0, "inherit"},
   {NULL, 0, 0, "on"},
   {zio_checksum_off, 0, 0, "off"},

diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index 5c7db4408879a6011f7f67a0953c53ee83cf7f44..84937f19bfe72325b9248abb8e6a17df46d9adda 100644 (file)
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -49,7 +49,7 @@ struct grub_gettext_msg
   const char *translated;
 };
 
-struct grub_gettext_msg *grub_gettext_msg_list = NULL;
+static struct grub_gettext_msg *grub_gettext_msg_list = NULL;
 
 #define GETTEXT_MAGIC_NUMBER           0
 #define GETTEXT_FILE_FORMAT            4

diff --git a/grub-core/gfxmenu/gfxmenu.c b/grub-core/gfxmenu/gfxmenu.c
index 1acab9ca7fe441007d583960a9f4183f5b7c11c7..76d83c44b52015668b33760fa3dde8793973c88e 100644 (file)
--- a/grub-core/gfxmenu/gfxmenu.c
+++ b/grub-core/gfxmenu/gfxmenu.c
@@ -37,7 +37,7 @@
 #include <grub/gfxmenu_view.h>
 #include <grub/time.h>
 
-grub_gfxmenu_view_t cached_view;
+static grub_gfxmenu_view_t cached_view;
 
 static void 
 grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))

diff --git a/grub-core/lib/legacy_parse.c b/grub-core/lib/legacy_parse.c
index fe421af35a45ef055a96c6c7acb232130ac348da..fb1a52bf8750dad5b680ad8ce2091d2c9d00f802 100644 (file)
--- a/grub-core/lib/legacy_parse.c
+++ b/grub-core/lib/legacy_parse.c
@@ -58,7 +58,7 @@ struct legacy_command
   const char *longdesc;
 };
 
-struct legacy_command legacy_commands[] =
+static struct legacy_command legacy_commands[] =
   {
     {"blocklist", "blocklist '%s'\n", NULL, 0, 1, {TYPE_FILE}, 0, "FILE",
      "Print the blocklist notation of the file FILE."},

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index dbd5fe4d06a4de571d4ee5ade5c6998f9782c172..e1bb7b7eaa37160cf0254e91cd171237869466b7 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -77,10 +77,10 @@ struct grub_relocator_fw_leftover
   grub_uint8_t freebytes[GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT / 8];
 };
 
-struct grub_relocator_fw_leftover *leftovers;
+static struct grub_relocator_fw_leftover *leftovers;
 #endif
 
-struct grub_relocator_extra_block *extra_blocks;
+static struct grub_relocator_extra_block *extra_blocks;
 
 void *
 get_virtual_current_address (grub_relocator_chunk_t in)

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 08cdcda37e2d3da7c72071b5593ddf1d7a763233..ecd5bd5cd1b8986de7f15189134bf05de67ee8ad 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -65,7 +65,7 @@ static void *kern_chunk_src;
 static grub_uint32_t bootflags;
 static int is_elf_kernel, is_64bit;
 static grub_uint32_t openbsd_root;
-struct grub_relocator *relocator = NULL;
+static struct grub_relocator *relocator = NULL;
 static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
 
 struct bsd_tag

diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
index b98bda223b3185d45fbf622dc17d4d661de71f78..14db50bcd23372f83280d956371d38099983466f 100644 (file)
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -46,7 +46,7 @@ struct module
   int cmdline_size;
 };
 
-struct module *modules, *modules_last;
+static struct module *modules, *modules_last;
 static grub_size_t cmdline_size;
 static grub_size_t total_modcmd;
 static unsigned modcnt;

diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index a0df6f4aa3b16e167ee33437f0b0e62a27d09125..b877b0ea5ef76872b7563c6b5ca475c45fbd91df 100644 (file)
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -49,7 +49,7 @@ struct tbl_alias
   char *name;
 };
 
-struct tbl_alias table_aliases[] =
+static struct tbl_alias table_aliases[] =
   {
     {GRUB_EFI_ACPI_20_TABLE_GUID, "ACPI_20"},
     {GRUB_EFI_ACPI_TABLE_GUID, "ACPI"},
@@ -219,7 +219,7 @@ struct property_descriptor
   void *data;
 };
 
-struct grub_xnu_devprop_device_descriptor *devices = 0;
+static struct grub_xnu_devprop_device_descriptor *devices = 0;
 
 grub_err_t
 grub_xnu_devprop_remove_property (struct grub_xnu_devprop_device_descriptor *dev,

diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
index 3141f002887dcf45d7a3dd8d4200e36caff81a97..05f581bb6b4fcf15ddc4accbfcd0a218f89b49a3 100644 (file)
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -54,7 +54,7 @@ struct module
   int cmdline_size;
 };
 
-struct module *modules, *modules_last;
+static struct module *modules, *modules_last;
 static grub_size_t cmdline_size;
 static grub_size_t total_modcmd;
 static unsigned modcnt;

diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
index e5d187f0ee68951404d35b044f8319812a4dce53..8e19568e264e1f05f8cba065acc87ac6005373e0 100644 (file)
--- a/grub-core/normal/auth.c
+++ b/grub-core/normal/auth.c
@@ -34,7 +34,7 @@ struct grub_auth_user
   int authenticated;
 };
 
-struct grub_auth_user *users = NULL;
+static struct grub_auth_user *users = NULL;
 
 grub_err_t
 grub_auth_register_authentication (const char *user,

diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c
index 108679913bcd7c552fab9b65e88e576f8d85c3e4..58131660388240b16e312ac6a459fd431c91e8b2 100644 (file)
--- a/grub-core/normal/context.c
+++ b/grub-core/normal/context.c
@@ -31,8 +31,8 @@ struct menu_pointer
   struct menu_pointer *prev;
 };
 
-struct menu_pointer initial_menu;
-struct menu_pointer *current_menu = &initial_menu;
+static struct menu_pointer initial_menu;
+static struct menu_pointer *current_menu = &initial_menu;
 
 void
 grub_env_unset_menu (void)

diff --git a/grub-core/normal/crypto.c b/grub-core/normal/crypto.c
index 465c9f81df82c0c72dc7bc4b25fbe8064f176a4c..19dafd8a7f2493a1098249b54e85c3b84bb1e516 100644 (file)
--- a/grub-core/normal/crypto.c
+++ b/grub-core/normal/crypto.c
@@ -31,7 +31,7 @@ struct load_spec
   char *modname;
 };
 
-struct load_spec *crypto_specs = NULL;
+static struct load_spec *crypto_specs = NULL;
 
 static void 
 grub_crypto_autoload (const char *name)

diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index e672a89d643c54289282873240b1818da13e36e4..32628dbaede9e9052bfbe9efeb5dc9774b20eeb3 100644 (file)
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -41,7 +41,7 @@ static const struct grub_arg_option options[] =
   {0, 0, 0, 0, 0, 0}
 };
 
-struct grub_serial_port *grub_serial_ports;
+static struct grub_serial_port *grub_serial_ports;
 
 struct grub_serial_output_state
 {
@@ -69,7 +69,7 @@ serial_fetch (grub_term_input_t term)
   return data->port->driver->fetch (data->port);
 }
 
-const struct grub_serial_input_state grub_serial_terminfo_input_template =
+static const struct grub_serial_input_state grub_serial_terminfo_input_template =
   {
     .tinfo =
     {
@@ -77,7 +77,7 @@ const struct grub_serial_input_state grub_serial_terminfo_input_template =
     }
   };
 
-const struct grub_serial_output_state grub_serial_terminfo_output_template =
+static const struct grub_serial_output_state grub_serial_terminfo_output_template =
   {
     .tinfo =
     {
@@ -87,11 +87,11 @@ const struct grub_serial_output_state grub_serial_terminfo_output_template =
     }
   };
 
-struct grub_serial_input_state grub_serial_terminfo_input;
+static struct grub_serial_input_state grub_serial_terminfo_input;
 
-struct grub_serial_output_state grub_serial_terminfo_output;
+static struct grub_serial_output_state grub_serial_terminfo_output;
 
-int registered = 0;
+static int registered = 0;
 
 static struct grub_term_input grub_serial_term_input =
 {

diff --git a/grub-core/term/usb_keyboard.c b/grub-core/term/usb_keyboard.c
index 30ed8f9c20ef556f20ae753dbe3b78d281d8e195..23c0c10cabdd3e7e0910beab9cb030ec4ba84f4a 100644 (file)
--- a/grub-core/term/usb_keyboard.c
+++ b/grub-core/term/usb_keyboard.c
@@ -435,7 +435,7 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
   return interpret_status (termdata->status) | termdata->mods;
 }
 
-struct grub_usb_attach_desc attach_hook =
+static struct grub_usb_attach_desc attach_hook =
 {
   .class = GRUB_USB_CLASS_HID,
   .hook = grub_usb_keyboard_attach