summaryrefslogtreecommitdiff
path: root/libparted/labels/pt-tools.c
diff options
context:
space:
mode:
authorBrian C. Lane <bcl@redhat.com>2011-03-02 14:36:33 -0800
committerJim Meyering <meyering@redhat.com>2011-03-05 22:05:56 +0100
commit81c82ad7d495c983abe1ccb8bf983d9949854f80 (patch)
tree3e075459a53ded45a7632d8324a5dafb29acf47e /libparted/labels/pt-tools.c
parent244b1b25a12198efb076e8c65be77b5750776583 (diff)
downloadparted-81c82ad7d495c983abe1ccb8bf983d9949854f80.tar.gz
Remove PED_ASSERT action argument
The action argument was a leftover from when the PED_ASSERT macro was last changed. This removes that argument from the macro and from all occurrences of it.
Diffstat (limited to 'libparted/labels/pt-tools.c')
-rw-r--r--libparted/labels/pt-tools.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libparted/labels/pt-tools.c b/libparted/labels/pt-tools.c
index 19d530c..19eac19 100644
--- a/libparted/labels/pt-tools.c
+++ b/libparted/labels/pt-tools.c
@@ -40,7 +40,7 @@ static char zero[16 * 1024];
int
ptt_write_sector (PedDisk const *disk, void const *buf, size_t buflen)
{
- PED_ASSERT (buflen <= disk->dev->sector_size, return 0);
+ PED_ASSERT (buflen <= disk->dev->sector_size);
/* Allocate a big enough buffer for ped_device_write. */
char *s0 = ped_malloc (disk->dev->sector_size);
if (s0 == NULL)
@@ -65,7 +65,7 @@ ptt_read_sectors (PedDevice const *dev, PedSector start_sector,
PedSector n_sectors, void **buf)
{
char *b = ped_malloc (n_sectors * dev->sector_size);
- PED_ASSERT (b != NULL, return 0);
+ PED_ASSERT (b != NULL);
if (!ped_device_read (dev, b, start_sector, n_sectors)) {
free (b);
return 0;
@@ -88,7 +88,7 @@ ptt_read_sector (PedDevice const *dev, PedSector sector_num, void **buf)
int
ptt_clear_sectors (PedDevice *dev, PedSector start, PedSector n)
{
- PED_ASSERT (dev->sector_size <= sizeof zero, return 0);
+ PED_ASSERT (dev->sector_size <= sizeof zero);
PedSector n_z_sectors = sizeof zero / dev->sector_size;
PedSector n_full = n / n_z_sectors;
PedSector i;