From 56ab8260f27beeed4d59c0b488e168c189ac9ec3 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 8 Jun 2019 13:53:35 -0700 Subject: [PATCH] DISK: Fix Coverity warnings --- sim_disk.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sim_disk.c b/sim_disk.c index d75220b5..f40c1aae 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -1404,7 +1404,7 @@ int part; uint32 base; uint32 dir_sec; uint16 dir_seg; -uint16 version; +uint16 version = 0; t_offset ret_val = (t_offset)-1; if ((dptr = find_dev_from_unit (uptr)) == NULL) @@ -1480,7 +1480,7 @@ for (part = 0; part < RT11_MAXPARTITIONS; part++) { goto Next_Partition; } while (dir_seg != 0); - ret_val = (t_offset)((base + highest) * 512); + ret_val = (t_offset)((base + highest) * (t_offset)512); version = Home.hb_w_sysver; if (type == RT11_SINGLEPART) @@ -1493,7 +1493,7 @@ Next_Partition: Return_Cleanup: if (partitions) { if (!sim_quiet) { - const char *parttype = "???"; + const char *parttype; switch (version) { case HB_C_SYSVER_V3A: @@ -1507,6 +1507,10 @@ if (partitions) { case HB_C_SYSVER_V05: parttype = "V05"; break; + + default: + parttype = "???"; + break; } sim_printf ("%s%d: '%s' Contains RT11 partitions\n", sim_dname (dptr), (int)(uptr-dptr->units), uptr->filename); sim_printf ("%d valid partition%s, Type: %s, Sectors On Disk: %u\n", partitions, partitions == 1 ? "" : "s", parttype, (uint32)(ret_val / 512));