--- parted-1.5.4/libparted/disk.c.broken	Thu Oct 25 16:31:37 2001
+++ parted-1.5.4/libparted/disk.c	Thu Oct 25 16:30:54 2001
@@ -803,7 +803,6 @@
 int
 ped_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state)
 {
-	PedDisk*	disk;
 	PedDiskOps*	ops;
 
 	PED_ASSERT (part != NULL, return 0);
@@ -819,7 +820,7 @@
 			PED_EXCEPTION_CANCEL,
 			"The flag '%s' is not available for %s disk labels.",
 			ped_partition_flag_get_name (flag),
-			disk->type->name);
+			part->disk->type->name);
 		return 0;
 	}
 
--- parted-1.5.4/libparted/disk_bsd.c.broken	Thu Oct 25 16:31:57 2001
+++ parted-1.5.4/libparted/disk_bsd.c	Thu Oct 25 16:38:29 2001
@@ -616,7 +616,7 @@
 bsd_alloc_metadata (PedDisk* disk)
 {
 	PedPartition*		new_part;
-	PedConstraint*		constraint_any;
+	PedConstraint*		constraint_any = NULL;
 
 	PED_ASSERT (disk != NULL, goto error);
 	PED_ASSERT (disk->dev != NULL, goto error);
--- parted-1.5.4/libparted/disk_loop.c.broken	Thu Oct 25 16:38:50 2001
+++ parted-1.5.4/libparted/disk_loop.c	Thu Oct 25 16:39:10 2001
@@ -202,7 +202,7 @@
 static int
 loop_read (PedDisk* disk)
 {
-	PedDevice*		dev;
+	PedDevice*		dev = NULL;
 	char			buf [512];
 	PedGeometry*		geom;
 	PedFileSystemType*	fs_type;
--- parted-1.5.4/libparted/disk_pc98.c.broken	Thu Oct 25 16:40:21 2001
+++ parted-1.5.4/libparted/disk_pc98.c	Thu Oct 25 16:40:32 2001
@@ -886,7 +886,7 @@
 pc98_alloc_metadata (PedDisk* disk)
 {
 	PedPartition*		new_part;
-	PedConstraint*		constraint_any;
+	PedConstraint*		constraint_any = NULL;
 
 	PED_ASSERT (disk != NULL, goto error);
 	PED_ASSERT (disk->dev != NULL, goto error);
--- parted-1.5.4/parted/ui.c.broken	Thu Oct 25 16:41:13 2001
+++ parted-1.5.4/parted/ui.c	Thu Oct 25 16:41:39 2001
@@ -311,7 +311,7 @@
 command_line_push_line (const char* line, int multi_word)
 {
 	int	quoted = 0;
-	char	quote_char;
+	char	quote_char = 0;
 	char	this_word [256];
 	int	i = 0;