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
|
@ -146,11 +146,10 @@ grub_pxefs_open (struct grub_file *file, const char *name)
|
|||
if (c.c2.status)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "open fails");
|
||||
|
||||
data = grub_malloc (sizeof (struct grub_pxe_data) + grub_strlen (name) + 1);
|
||||
data = grub_zalloc (sizeof (struct grub_pxe_data) + grub_strlen (name) + 1);
|
||||
if (! data)
|
||||
return grub_errno;
|
||||
|
||||
data->packet_number = 0;
|
||||
data->block_size = grub_pxe_blksize;
|
||||
grub_strcpy (data->filename, name);
|
||||
|
||||
|
|
|
@ -263,13 +263,11 @@ grub_iso9660_mount (grub_disk_t disk)
|
|||
return 0;
|
||||
}
|
||||
|
||||
data = grub_malloc (sizeof (struct grub_iso9660_data));
|
||||
data = grub_zalloc (sizeof (struct grub_iso9660_data));
|
||||
if (! data)
|
||||
return 0;
|
||||
|
||||
data->disk = disk;
|
||||
data->rockridge = 0;
|
||||
data->joliet = 0;
|
||||
|
||||
block = 16;
|
||||
do
|
||||
|
@ -509,8 +507,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
|
|||
else
|
||||
{
|
||||
size = entry->len - 5;
|
||||
filename = grub_malloc (size + 1);
|
||||
filename[0] = '\0';
|
||||
filename = grub_zalloc (size + 1);
|
||||
}
|
||||
filename_alloc = 1;
|
||||
grub_strncpy (filename, (char *) &entry->data[1], size);
|
||||
|
|
4
fs/jfs.c
4
fs/jfs.c
|
@ -382,11 +382,10 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
|
|||
return 0;
|
||||
}
|
||||
|
||||
diro = grub_malloc (sizeof (struct grub_jfs_diropen));
|
||||
diro = grub_zalloc (sizeof (struct grub_jfs_diropen));
|
||||
if (!diro)
|
||||
return 0;
|
||||
|
||||
diro->index = 0;
|
||||
diro->data = data;
|
||||
diro->inode = inode;
|
||||
|
||||
|
@ -397,7 +396,6 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
|
|||
diro->next_leaf = (struct grub_jfs_leaf_next_dirent *) de;
|
||||
diro->sorted = (char *) (inode->dir.header.sorted);
|
||||
diro->count = inode->dir.header.count;
|
||||
diro->dirpage = 0;
|
||||
|
||||
return diro;
|
||||
}
|
||||
|
|
|
@ -601,11 +601,10 @@ list_file (struct grub_ntfs_file *diro, char *pos,
|
|||
(u32at (pos, 0x48) & ATTR_DIRECTORY) ? GRUB_FSHELP_DIR :
|
||||
GRUB_FSHELP_REG;
|
||||
|
||||
fdiro = grub_malloc (sizeof (struct grub_ntfs_file));
|
||||
fdiro = grub_zalloc (sizeof (struct grub_ntfs_file));
|
||||
if (!fdiro)
|
||||
return 0;
|
||||
|
||||
grub_memset (fdiro, 0, sizeof (*fdiro));
|
||||
fdiro->data = diro->data;
|
||||
fdiro->ino = u32at (pos, 0);
|
||||
|
||||
|
@ -791,12 +790,10 @@ grub_ntfs_mount (grub_disk_t disk)
|
|||
if (!disk)
|
||||
goto fail;
|
||||
|
||||
data = (struct grub_ntfs_data *) grub_malloc (sizeof (*data));
|
||||
data = (struct grub_ntfs_data *) grub_zalloc (sizeof (*data));
|
||||
if (!data)
|
||||
goto fail;
|
||||
|
||||
grub_memset (data, 0, sizeof (*data));
|
||||
|
||||
data->disk = disk;
|
||||
|
||||
/* Read the BPB. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue