2009-07-16 Pavel Roskin <proski@gnu.org>
* kern/mm.c (grub_zalloc): New function. (grub_debug_zalloc): Likewise. * include/grub/mm.h: Declare grub_zalloc() and grub_debug_zalloc(). * util/misc.c (grub_zalloc): New function. * bus/usb/uhci.c (grub_uhci_pci_iter): Use grub_zalloc() instead of grub_malloc(), remove unneeded initializations. * bus/usb/usbhub.c (grub_usb_hub_add_dev): Likewise. * commands/extcmd.c (grub_extcmd_dispatcher): Likewise. * commands/parttool.c (grub_cmd_parttool): Likewise. * disk/i386/pc/biosdisk.c (grub_biosdisk_open): Likewise. * disk/raid5_recover.c (grub_raid5_recover): Likewise. * disk/raid6_recover.c (grub_raid6_recover): Likewise. * disk/usbms.c (grub_usbms_finddevs): Likewise. * efiemu/mm.c (grub_efiemu_request_memalign): Likewise. * efiemu/pnvram.c (grub_efiemu_pnvram): Likewise. (grub_cmd_efiemu_pnvram): Likewise. * fs/i386/pc/pxe.c (grub_pxefs_open): Likewise. * fs/iso9660.c (grub_iso9660_mount): Likewise. (grub_iso9660_iterate_dir): Likewise. * fs/jfs.c (grub_jfs_opendir): Likewise. * fs/ntfs.c (list_file): Likewise. (grub_ntfs_mount): Likewise. * kern/disk.c (grub_disk_open): Likewise. * kern/dl.c (grub_dl_load_core): Likewise. * kern/elf.c (grub_elf_file): Likewise. * kern/env.c (grub_env_context_open): Likewise. (grub_env_set): Likewise. (grub_env_set_data_slot): Likewise. * kern/file.c (grub_file_open): Likewise. * kern/fs.c (grub_fs_blocklist_open): Likewise. * loader/i386/multiboot.c (grub_module): Likewise. * loader/xnu.c (grub_xnu_create_key): Likewise. (grub_xnu_create_value): Likewise. * normal/main.c (grub_normal_add_menu_entry): Likewise. (read_config_file): Likewise. * normal/menu_entry.c (make_screen): Likewise. * partmap/sun.c (sun_partition_map_iterate): Likewise. * script/sh/lexer.c (grub_script_lexer_init): Likewise. * script/sh/script.c (grub_script_parse): Likewise. * video/bitmap.c (grub_video_bitmap_create): Likewise. * video/readers/jpeg.c (grub_video_reader_jpeg): Likewise. * video/readers/png.c (grub_png_output_byte): Likewise. (grub_video_reader_png): Likewise.
This commit is contained in:
		
							parent
							
								
									830afef7c2
								
							
						
					
					
						commit
						eab58da22c
					
				
					 34 changed files with 132 additions and 132 deletions
				
			
		|  | @ -166,11 +166,9 @@ grub_normal_add_menu_entry (int argc, const char **args, | |||
|   struct grub_menu_entry_class *classes_tail; | ||||
| 
 | ||||
|   /* Allocate dummy head node for class list.  */ | ||||
|   classes_head = grub_malloc (sizeof (struct grub_menu_entry_class)); | ||||
|   classes_head = grub_zalloc (sizeof (struct grub_menu_entry_class)); | ||||
|   if (! classes_head) | ||||
|     return grub_errno; | ||||
|   classes_head->name = 0; | ||||
|   classes_head->next = 0; | ||||
|   classes_tail = classes_head; | ||||
| 
 | ||||
|   menu = grub_env_get_data_slot ("menu"); | ||||
|  | @ -206,7 +204,7 @@ grub_normal_add_menu_entry (int argc, const char **args, | |||
| 		} | ||||
| 
 | ||||
| 	      /* Create a new class and add it at the tail of the list.  */ | ||||
| 	      new_class = grub_malloc (sizeof (struct grub_menu_entry_class)); | ||||
| 	      new_class = grub_zalloc (sizeof (struct grub_menu_entry_class)); | ||||
| 	      if (! new_class) | ||||
| 		{ | ||||
| 		  grub_free (class_name); | ||||
|  | @ -215,7 +213,6 @@ grub_normal_add_menu_entry (int argc, const char **args, | |||
| 		} | ||||
| 	      /* Fill in the new class node.  */ | ||||
| 	      new_class->name = class_name; | ||||
| 	      new_class->next = 0; | ||||
| 	      /* Link the tail to it, and make it the new tail.  */ | ||||
| 	      classes_tail->next = new_class; | ||||
| 	      classes_tail = new_class; | ||||
|  | @ -267,7 +264,7 @@ grub_normal_add_menu_entry (int argc, const char **args, | |||
|   while (*last) | ||||
|     last = &(*last)->next; | ||||
| 
 | ||||
|   *last = grub_malloc (sizeof (**last)); | ||||
|   *last = grub_zalloc (sizeof (**last)); | ||||
|   if (! *last) | ||||
|     { | ||||
|       free_menu_entry_classes (classes_head); | ||||
|  | @ -278,7 +275,6 @@ grub_normal_add_menu_entry (int argc, const char **args, | |||
| 
 | ||||
|   (*last)->title = menutitle; | ||||
|   (*last)->classes = classes_head; | ||||
|   (*last)->next = 0; | ||||
|   (*last)->sourcecode = menusourcecode; | ||||
| 
 | ||||
|   menu->size++; | ||||
|  | @ -346,11 +342,9 @@ read_config_file (const char *config) | |||
|   newmenu = grub_env_get_data_slot ("menu"); | ||||
|   if (! newmenu) | ||||
|     { | ||||
|       newmenu = grub_malloc (sizeof (*newmenu)); | ||||
|       newmenu = grub_zalloc (sizeof (*newmenu)); | ||||
|       if (! newmenu) | ||||
| 	return 0; | ||||
|       newmenu->size = 0; | ||||
|       newmenu->entry_list = 0; | ||||
| 
 | ||||
|       grub_env_set_data_slot ("menu", newmenu); | ||||
|     } | ||||
|  |  | |||
|  | @ -416,18 +416,11 @@ make_screen (grub_menu_entry_t entry) | |||
|   struct screen *screen; | ||||
| 
 | ||||
|   /* Initialize the screen.  */ | ||||
|   screen = grub_malloc (sizeof (*screen)); | ||||
|   screen = grub_zalloc (sizeof (*screen)); | ||||
|   if (! screen) | ||||
|     return 0; | ||||
| 
 | ||||
|   screen->num_lines = 1; | ||||
|   screen->column = 0; | ||||
|   screen->real_column = 0; | ||||
|   screen->line = 0; | ||||
|   screen->x = 0; | ||||
|   screen->y = 0; | ||||
|   screen->killed_text = 0; | ||||
|   screen->completion_shown = 0; | ||||
|   screen->lines = grub_malloc (sizeof (struct line)); | ||||
|   if (! screen->lines) | ||||
|     goto fail; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue