Changeset 2125 in MondoRescue for branches/2.2.8/mondo/src/common

Timestamp:

Jan 14, 2009, 3:50:19 PM (17 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)

Location:

branches/2.2.8/mondo/src/common

Files:

• libmondo-mountlist.c (modified) (4 diffs)
• libmondo-string.c (modified) (1 diff)

branches/2.2.8/mondo/src/common/libmondo-mountlist.c

@@ -151 +151 @@
                 res++;
             }
-            amount_allocated += mountlist->el[pos].size / 1024;
+            amount_allocated += mountlist->el[pos].size / 1024L;
             prev_sp_no = cur_sp_no;
         }
@@ -304 +304 @@
                     res++;
                 }
-                amount_allocated += mountlist->el[pos].size / 1024;
+                amount_allocated += mountlist->el[pos].size / 1024L;
                 prev_sp_no = cur_sp_no;
             }
@@ -310 +310 @@
 
         /* OK, continue with main loop */
-        amount_allocated += mountlist->el[pos].size / 1024;
+        amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
     }
@@ -459 +459 @@
         }
         /* OK, continue with main loop */
-        amount_allocated += mountlist->el[pos].size / 1024;
+        amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
     }

branches/2.2.8/mondo/src/common/libmondo-string.c

@@ -401 +401 @@
     sprintf(output, "%-24s %-24s %-10s %8lld", mountlist->el[lino].device,
             mountlist->el[lino].mountpoint, mountlist->el[lino].format,
-            mountlist->el[lino].size / 1024);
+            mountlist->el[lino].size / 1024L);
     return (output);
 }