From 5eb27029eed93990afe6538dd317a467bcb01ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 18 Sep 2008 09:14:50 +0000 Subject: [PATCH] * Only renamed a few variables to fit our style guide. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27613 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../intel/write_support.cpp | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp index 0698281b98..e9c1cacd7a 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp @@ -131,35 +131,36 @@ sector_align_up(off_t offset) static bool validate_resize(partition_data *partition, off_t *size) { - off_t new_size = *size; + off_t newSize = *size; // size remains the same? - if (new_size == partition->size) + if (newSize == partition->size) return true; - if (new_size < 0) - new_size = 0; + if (newSize < 0) + newSize = 0; else - new_size = sector_align(new_size); + newSize = sector_align(newSize); // grow partition? - if (new_size > partition->size) { - *size = new_size; + if (newSize > partition->size) { + *size = newSize; return true; } // shrink partition // no child has to be over the new size of the parent partition - // TODO: shouldn't be just: off_t current_end = new_size; ??? probably not - off_t current_end = partition->offset + new_size; + // TODO: shouldn't be just: off_t currentEnd = newSize; ??? probably not + // If child->offset is relative to parent, then yes! + off_t currentEnd = partition->offset + newSize; for (int32 i = 0; i < partition->child_count; i++) { partition_data *child = get_child_partition(partition->id, i); - if (child && child->offset + child->size > current_end) - current_end = child->offset + child->size; + if (child && child->offset + child->size > currentEnd) + currentEnd = child->offset + child->size; } - new_size = current_end - partition->offset; + newSize = currentEnd - partition->offset; // make the size a multiple of the block size (greater one) - new_size = sector_align_up(new_size); - *size = new_size; + newSize = sector_align_up(newSize); + *size = newSize; return true; }