pointer checks before calling grub_free().
* grub-core/commands/wildcard.c (match_devices): Likewise.
* grub-core/commands/wildcard.c (match_files): Likewise.
* grub-core/fs/cpio.c (grub_cpio_dir): Likewise.
* grub-core/fs/cpio.c (grub_cpio_open): Likewise.
* grub-core/fs/udf.c (grub_udf_read_block): Likewise.
* grub-core/fs/xfs.c (grub_xfs_read_block): Likewise.
* grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Likewise.
* grub-core/normal/cmdline.c (grub_cmdline_get): Likewise.
* grub-core/script/yylex.l (grub_lexer_unput): Likewise.
* grub-core/video/readers/jpeg.c (grub_video_reader_jpeg): Likewise.
* grub-core/video/readers/png.c (grub_png_output_byte): Likewise.
+2011-06-26 Szymon Janc <szymon@janc.net.pl>
+
+ * grub-core/commands/cmp.c (grub_cmd_cmp): Remove unnecessary NULL
+ pointer checks before calling grub_free().
+ * grub-core/commands/wildcard.c (match_devices): Likewise.
+ * grub-core/commands/wildcard.c (match_files): Likewise.
+ * grub-core/fs/cpio.c (grub_cpio_dir): Likewise.
+ * grub-core/fs/cpio.c (grub_cpio_open): Likewise.
+ * grub-core/fs/udf.c (grub_udf_read_block): Likewise.
+ * grub-core/fs/xfs.c (grub_xfs_read_block): Likewise.
+ * grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Likewise.
+ * grub-core/normal/cmdline.c (grub_cmdline_get): Likewise.
+ * grub-core/script/yylex.l (grub_lexer_unput): Likewise.
+ * grub-core/video/readers/jpeg.c (grub_video_reader_jpeg): Likewise.
+ * grub-core/video/readers/png.c (grub_png_output_byte): Likewise.
+
2011-06-25 Patrick <p55@mailinator.com>
* grub-core/kern/main.c (grub_load_normal_mode): Correct the comment.
cleanup:
- if (buf1)
- grub_free (buf1);
- if (buf2)
- grub_free (buf2);
+ grub_free (buf1);
+ grub_free (buf2);
if (file1)
grub_file_close (file1);
if (file2)
for (i = 0; devs && devs[i]; i++)
grub_free (devs[i]);
- if (devs)
- grub_free (devs);
+ grub_free (devs);
return 0;
}
fail:
- if (dir)
- grub_free (dir);
+ grub_free (dir);
for (i = 0; files && files[i]; i++)
grub_free (files[i]);
- if (files)
- grub_free (files);
+ grub_free (files);
if (dev)
grub_device_close (dev);
- if (device_name)
- grub_free (device_name);
+ grub_free (device_name);
grub_error_pop ();
return 0;
info.mtimeset = 1;
hook (name + len, &info);
- if (prev)
- grub_free (prev);
+ grub_free (prev);
prev = name;
}
else
fail:
- if (prev)
- grub_free (prev);
-
- if (data)
- grub_free (data);
+ grub_free (prev);
+ grub_free (data);
grub_dl_unref (my_mod);
fail:
- if (data)
- grub_free (data);
+ grub_free (data);
grub_dl_unref (my_mod);
}
fail:
- if (buf)
- grub_free (buf);
+ grub_free (buf);
return 0;
}
}
}
- if (leaf)
- grub_free (leaf);
+ grub_free (leaf);
return GRUB_XFS_FSB_TO_BLOCK(node->data, ret);
}
if (file)
grub_file_close (file);
- if (file_path)
- grub_free (file_path);
+ grub_free (file_path);
if (address)
efi_call_2 (b->free_pages, address, pages);
case GRUB_TERM_CTRL | 'k':
if (lpos < llen)
{
- if (kill_buf)
- grub_free (kill_buf);
+ grub_free (kill_buf);
kill_buf = grub_malloc ((llen - lpos + 1)
* sizeof (grub_uint32_t));
{
grub_size_t n = lpos;
- if (kill_buf)
- grub_free (kill_buf);
+ grub_free (kill_buf);
kill_buf = grub_malloc (n + 1);
if (grub_errno)
{
struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate;
- if (lexerstate->prefix)
- grub_free (lexerstate->prefix);
+ grub_free (lexerstate->prefix);
lexerstate->prefix = grub_strdup (text);
if (! lexerstate->prefix)
grub_jpeg_decode_jpeg (data);
for (i = 0; i < 4; i++)
- if (data->huff_value[i])
- grub_free (data->huff_value[i]);
+ grub_free (data->huff_value[i]);
grub_free (data);
}
}
}
- if (blank_line)
- grub_free (blank_line);
+ grub_free (blank_line);
data->cur_column = 0;
data->first_line = 0;