From 0215dcbfdce43891bc792cca99d6077db56ae1f1 Mon Sep 17 00:00:00 2001 From: robertmh Date: Tue, 12 Jun 2007 14:23:12 +0000 Subject: [PATCH] 2007-06-12 Robert Millan * normal/command.c (grub_command_execute): Use NULL rather than 0 for "pager" assignment. * util/biosdisk.c (grub_util_biosdisk_get_grub_dev): Likewise for "pcdata". * util/grub-probe.c (probe): Likewise for "drive_name". --- ChangeLog | 8 ++++++++ normal/command.c | 2 +- util/biosdisk.c | 2 +- util/grub-probe.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index febea88a0..829f69f86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-12 Robert Millan + + * normal/command.c (grub_command_execute): Use NULL rather than 0 for + "pager" assignment. + * util/biosdisk.c (grub_util_biosdisk_get_grub_dev): Likewise for + "pcdata". + * util/grub-probe.c (probe): Likewise for "drive_name". + 2007-06-11 Robert Millan * util/i386/pc/grub-mkrescue.in: Pad both floppy images with zeroes, diff --git a/normal/command.c b/normal/command.c index 43d1cf09d..e56cb6b02 100644 --- a/normal/command.c +++ b/normal/command.c @@ -203,7 +203,7 @@ grub_command_execute (char *cmdline, int interactive) if (interactive) pager = grub_env_get ("pager"); else - pager = 0; + pager = NULL; if (pager && (! grub_strcmp (pager, "1"))) grub_set_more (1); diff --git a/util/biosdisk.c b/util/biosdisk.c index 469c2b13b..e75063076 100644 --- a/util/biosdisk.c +++ b/util/biosdisk.c @@ -732,7 +732,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev) int find_partition (grub_disk_t disk __attribute__ ((unused)), const grub_partition_t partition) { - struct grub_pc_partition *pcdata = 0; + struct grub_pc_partition *pcdata = NULL; if (strcmp (partition->partmap->name, "pc_partition_map") == 0) pcdata = partition->data; diff --git a/util/grub-probe.c b/util/grub-probe.c index 26c47f243..d2ee69fe3 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -81,7 +81,7 @@ static void probe (const char *path) { char *device_name; - char *drive_name = 0; + char *drive_name = NULL; grub_device_t dev; grub_fs_t fs;