Changeset 2932 in MondoRescue for branches

Timestamp:

Jan 24, 2012, 2:45:39 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #577 by having factor back as a float (not a long ! it's a decimal value) and making the appropriate cast.

File:

• branches/3.0/mondo/src/mondorestore/mondo-prep.c (modified) (5 diffs)

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -2488 +2488 @@
 
     /** float ***********************************************************/
-    long long factor;
+    float factor;
     long long new_size;
 
@@ -2523 +2523 @@
 
     drivemntlist = malloc(sizeof(struct mountlist_reference));
-    drivemntlist->el =
-        malloc(sizeof(struct mountlist_line *) * MAX_MOUNTLIST_ENTRIES);
+    drivemntlist->el = malloc(sizeof(struct mountlist_line *) * MAX_MOUNTLIST_ENTRIES);
 
     if (!drivemntlist) {
@@ -2538 +2537 @@
     }
 
-    if (original_size_of_drive <= 0) {
+    if (original_size_of_drive <= 0LL) {
         mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
@@ -2544 +2543 @@
         return;
     }
-    factor = (current_size_of_drive) / (original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %lld)",
+    factor = ((float)current_size_of_drive/(float)original_size_of_drive);
+    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
             drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
     log_to_screen(tmp);
@@ -2554 +2553 @@
         /* the 'atoi' thing is to make sure we don't try to resize _images_, whose formats will be numeric */
         if (!atoi(drivemntlist->el[partno]->format)) {
-            new_size = (drivemntlist->el[partno]->size) * factor;
+            new_size = (long long)((drivemntlist->el[partno]->size) * factor);
         } else {
             new_size = drivemntlist->el[partno]->size;