[Morphix-cvs] partitionmorpher/src callbacks.c,1.8,1.9 pm_libparted.c,1.6,1.7

[<ale...@us...>]

Update of /cvsroot/morphix/partitionmorpher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26198

Modified Files:
	callbacks.c pm_libparted.c 
Log Message:
small cleanups


Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** callbacks.c	12 Oct 2003 02:01:47 -0000	1.8
--- callbacks.c	12 Oct 2003 18:27:28 -0000	1.9
***************
*** 516,519 ****
--- 516,520 ----
  					ped_file_system_get_resize_constraint(fs);
  				if (resize_con) {
+ 					printf("Debug: constraint accepted: mb_min: %ld mb_max: %ld\n",(int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS),(int)(resize_con->max_size * 1.0 / MEGABYTE_SIZE * MEGABYTE_SECTORS));
  					partinfo[i].min_size = (int)resize_con->min_size;
  					partinfo[i].mb_min_size = (int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS);
***************
*** 522,525 ****
--- 523,529 ----
  					ped_constraint_destroy(resize_con);
  				}
+ 				else {
+ 					printf("Debug: constraint failed! Can'tresize %dth partition\n",i);
+ 				}
  				ped_file_system_close(fs);
  				// The following two lines shouldn't be necessary since we initialize partinfo[i].label to ""
***************
*** 530,533 ****
--- 534,540 ----
  					partinfo[i].label = label;
  			}
+ 			else {
+ 				printf("Debug: filesystem couldn't be opened\n");
+ 			}
  		}
  		else {
***************
*** 1203,1207 ****
  		unredirect_stderr(saved_fd, stderr_pipe);
  		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_boot_flag)))
! 		   set_part_flag_state(&devices[selected_device],partinfo[selected_partition].part,PED_PARTITION_BOOT,1);
  		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_root_flag)))
  			set_part_flag_state(&devices[selected_device],partinfo[selected_partition].part,PED_PARTITION_ROOT,1);
--- 1210,1214 ----
  		unredirect_stderr(saved_fd, stderr_pipe);
  		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_boot_flag)))
! 			set_part_flag_state(&devices[selected_device],partinfo[selected_partition].part,PED_PARTITION_BOOT,1);
  		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_root_flag)))
  			set_part_flag_state(&devices[selected_device],partinfo[selected_partition].part,PED_PARTITION_ROOT,1);

Index: pm_libparted.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pm_libparted.c	12 Oct 2003 02:01:48 -0000	1.6
--- pm_libparted.c	12 Oct 2003 18:27:28 -0000	1.7
***************
*** 674,678 ****
  		fs = ped_file_system_open(&part->geom);
  		if (!fs) {
- 			ped_file_system_close (fs);
  			ped_constraint_destroy (constraint);
  			ped_disk_destroy (disk);
--- 674,677 ----