Changeset 2125 in MondoRescue for branches/2.2.8/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Jan 14, 2009, 3:50:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Changes the way to compute original_size_of_drive in mondo-prep.c to correspond to the way it's done in libmondo-mountlist.c, and thus avoiding aborting nuje mode for 2 MB (which could come from adjustements in computation)

File:

• branches/2.2.8/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -241 +241 @@
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
     strcpy(mountlist->el[currline].format, format_str);
-    mountlist->el[currline].size = atol(size_str) * 1024;
+    mountlist->el[currline].size = atol(size_str) * 1024L;
     mountlist->entries++;
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
@@ -1194 +1194 @@
     strcpy(mountpt_used_to_be, mountlist->el[currline].mountpoint);
     strcpy(format_str, mountlist->el[currline].format);
-    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
+    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024L);
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
     label0 = newtLabel(2, 1, "Device:");
@@ -1297 +1297 @@
                                        mountlist->el[currline].device);
         } else {
-            mountlist->el[currline].size = atol(size_str) * 1024;
+            mountlist->el[currline].size = atol(size_str) * 1024L;
         }
     }
@@ -2506 +2506 @@
         sprintf(tmp, "%-22s %8lld",
                 unallocated_raid_partitions->el[i].device,
-                unallocated_raid_partitions->el[i].size / 1024);
+                unallocated_raid_partitions->el[i].size / 1024L);
         newtListboxAppendEntry(listbox, tmp, keylist[i]);
     }