aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-17 12:12:29 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-17 12:12:29 +0000
commit6c41b2723f5cac6e62e68925e7a73f30b11a7a06 (patch)
treee0cb44e39d70f6fbd706d1e41d1e670ba38c32a6 /vl.c
parentf610349f36a78231a843ab57499b23ed9ea5ce1e (diff)
Don't compare '\0' against pointers.
Add a note from Fabrice in slow_st template. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3669 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/vl.c b/vl.c
index 8defc30eef..b9c97b0357 100644
--- a/vl.c
+++ b/vl.c
@@ -8256,20 +8256,20 @@ int main(int argc, char **argv)
#endif
linux_boot = (kernel_filename != NULL);
net_boot = (boot_devices_bitmap >> ('n' - 'a')) && 0xF;
-
+
/* XXX: this should not be: some embedded targets just have flash */
if (!linux_boot && net_boot == 0 &&
- hd_filename[0] == '\0' &&
- (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
- fd_filename[0] == '\0' &&
- pflash_filename[0] == '\0')
+ hd_filename[0] == NULL &&
+ (cdrom_index >= 0 && hd_filename[cdrom_index] == NULL) &&
+ fd_filename[0] == NULL &&
+ pflash_filename[0] == NULL)
help(1);
/* boot to floppy or the default cd if no hard disk defined yet */
if (!boot_devices[0]) {
- if (hd_filename[0] != '\0')
+ if (hd_filename[0] != NULL)
boot_devices = "c";
- else if (fd_filename[0] != '\0')
+ else if (fd_filename[0] != NULL)
boot_devices = "a";
else
boot_devices = "d";