Re: [PATCH 0/2] Clean up PED_ASSERT usage

[Jim Meyering]

Brian C. Lane wrote:
> The first one of these applies cleanly to the fedora master branch
> of parted and passes all the tests. The second will only apply to the
> current upstream master.
>
> Brian C. Lane (2):
>   Remove PED_ASSERT from dos geometry checking
>   Remove PED_ASSERT action argument

Thanks!
I'm applying these with the following change squashed into the latter.
Without the calc.c change, it didn't compile.
The other two hunks are merely aesthetic.

diff --git a/include/parted/debug.h b/include/parted/debug.h
index e7fafb6..71372d4 100644
--- a/include/parted/debug.h
+++ b/include/parted/debug.h
@@ -79,7 +79,7 @@ static void PED_DEBUG (int level, ...)

 #else /* !DEBUG */

-#define PED_ASSERT(cond)       do {} while (0)
+#define PED_ASSERT(cond)               do {} while (0)
 #define PED_DEBUG(level, ...)           do {} while (0)


diff --git a/libparted/arch/gnu.c b/libparted/arch/gnu.c
index 1ac0319..664f300 100644
--- a/libparted/arch/gnu.c
+++ b/libparted/arch/gnu.c
@@ -671,7 +671,7 @@ doggy_first_block_write:
        /* We are now left with (strictly) less then a store block to write
           to disk.  Thus, we read the block, overlay the buffer and flush.  */
        PED_ASSERT (count * PED_SECTOR_SIZE_DEFAULT
-                       < arch_specific->store->block_size);
+                   < arch_specific->store->block_size);

 doggy_last_block_read:
        /* We do not bother looping as we are only reading a
diff --git a/libparted/fs/fat/calc.c b/libparted/fs/fat/calc.c
index 4193dcd..dddd84b 100644
--- a/libparted/fs/fat/calc.c
+++ b/libparted/fs/fat/calc.c
@@ -123,8 +123,7 @@ fat_check_resize_geometry (const PedFileSystem* fs,
        min_free_space = total_space - new_total_space + dir_space;

        PED_ASSERT (new_cluster_count
-                       <= fat_max_cluster_count (FAT_TYPE_FAT32),
-                   return 0);
+                   <= fat_max_cluster_count (FAT_TYPE_FAT32));

        if (free_space < min_free_space) {
                char* needed = ped_unit_format (geom->dev, min_free_space);