Update of /cvsroot/evms/evms2/engine/plugins/dos In directory sc8-pr-cvs1:/tmp/cvs-serv23232/plugins/dos Modified Files: bsd.c checks.c checks.h commit.c defsegmgr.c discovery.c display.c display.h embedded.c move.c os2dlat.c os2dlat.h ptables.h resolver.c segoptions.c segs.c segs.h solarisX86.c unixware.c Log Message: Stop the screaming BOOLEANs! Change the "BOOLEAN" type to "boolean". Index: bsd.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/bsd.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bsd.c 1 Sep 2003 17:40:51 -0000 1.7 +++ bsd.c 25 Sep 2003 14:54:23 -0000 1.8 @@ -72,7 +72,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc != DLIST_SUCCESS) { Index: checks.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/checks.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- checks.c 1 Sep 2003 17:40:51 -0000 1.7 +++ checks.c 25 Sep 2003 14:54:23 -0000 1.8 @@ -38,7 +38,7 @@ -BOOLEAN isa_linux_raid_partition_record(struct partition *p) +boolean isa_linux_raid_partition_record(struct partition *p) { if ( SYS_IND(p) == LINUX_RAID_PARTITION ) return TRUE; @@ -46,7 +46,7 @@ return FALSE; } -BOOLEAN isa_data_partition_record(struct partition *p) +boolean isa_data_partition_record(struct partition *p) { if ( (isa_null_partition_record(p) == FALSE) && @@ -57,7 +57,7 @@ return FALSE; } -BOOLEAN isa_null_partition_record(struct partition *p) +boolean isa_null_partition_record(struct partition *p) { int i; u_int8_t *uip = (u_int8_t *) p; @@ -71,7 +71,7 @@ } -BOOLEAN isa_zero_length_partition_record(struct partition *p) +boolean isa_zero_length_partition_record(struct partition *p) { if ( NR_SECTS(p) == 0 ) @@ -82,7 +82,7 @@ } // test on size field only in case there is garbage in ptable area -BOOLEAN ptable_has_partition_records( LOGICALDISK *ld, Master_Boot_Record *mbr ) +boolean ptable_has_partition_records( LOGICALDISK *ld, Master_Boot_Record *mbr ) { if ( (isa_zero_length_partition_record(&mbr->Partition_Table[0])==TRUE) && @@ -95,7 +95,7 @@ return TRUE; } -BOOLEAN ptable_has_data_partition_record( Master_Boot_Record *mbr ) +boolean ptable_has_data_partition_record( Master_Boot_Record *mbr ) { if ( (isa_data_partition_record(&mbr->Partition_Table[0])==TRUE) || @@ -108,7 +108,7 @@ return FALSE; } -BOOLEAN isa_ebr_partition_record(struct partition *p) +boolean isa_ebr_partition_record(struct partition *p) { if ( (SYS_IND(p) == DOS_EXTENDED_PARTITION) || (SYS_IND(p) == WIN98_EXTENDED_PARTITION) || @@ -119,7 +119,7 @@ return FALSE; } -BOOLEAN isa_mbr_partition_record(struct partition *p) +boolean isa_mbr_partition_record(struct partition *p) { if ( SYS_IND(p) == MBR_PARTITION ) // our own internal define used by build_mbr() return TRUE; // which is found in segs.c @@ -127,7 +127,7 @@ return FALSE; } -BOOLEAN isa_linux_swap_partition_record(LOGICALDISK *ld, Partition_Record *p, lba_t extd_partition_lba ) +boolean isa_linux_swap_partition_record(LOGICALDISK *ld, Partition_Record *p, lba_t extd_partition_lba ) { if ( SYS_IND(p) == LINUX_SWAP_PARTITION ) { // actually Solaris uses the same IND return TRUE; @@ -140,7 +140,7 @@ // Test if disk has a GUID Partition Table by testing for a protective MBR. // A protective MBR has a single partition record of type 0xEE. -BOOLEAN has_guid_partition_table( Master_Boot_Record *mbr ) +boolean has_guid_partition_table( Master_Boot_Record *mbr ) { int i; @@ -168,7 +168,7 @@ #define AIX_IPL_REC_ID 0xc9c2d4c1 // Value is EBCIDIC 'IBMA' -BOOLEAN has_msdos_signature( Master_Boot_Record *mbr ) +boolean has_msdos_signature( Master_Boot_Record *mbr ) { if ( ( (*( (unsigned int *) mbr )) != AIX_IPL_REC_ID ) && @@ -190,7 +190,7 @@ struct partition *part, lba_t ebr_lba, lba_t extd_partition_lba, - BOOLEAN ebr_chaining ) + boolean ebr_chaining ) { chs_t chs; chs_t start_chs; @@ -458,9 +458,9 @@ Master_Boot_Record *mbr, // sector buffer - mbr or ebr lba_t mbr_lba, // LBA of sector lba_t extd_partition_lba, // LBA of extd part on this disk - BOOLEAN ebr_chaining, // TRUE if following ebr chain + boolean ebr_chaining, // TRUE if following ebr chain int logical_count, // where we are in the ebr chain - BOOLEAN final_call ) // if this is the final attempt + boolean final_call ) // if this is the final attempt { // to validate the chain. int i; int extended_partition_count = 0; @@ -623,7 +623,7 @@ } -BOOLEAN partition_record_uses_lba_addressing( LOGICALDISK *ld, struct partition *part ) +boolean partition_record_uses_lba_addressing( LOGICALDISK *ld, struct partition *part ) { u_int32_t start_cylinders, start_heads, start_sectors; u_int32_t end_cylinders, end_heads, end_sectors; @@ -693,7 +693,7 @@ * geometry for CHS values, regardless of the LBA, then it * is using LBA addressing mode. */ -BOOLEAN disk_uses_lba_addressing( LOGICALDISK *ld ) +boolean disk_uses_lba_addressing( LOGICALDISK *ld ) { int i,rc; Master_Boot_Record mbr; Index: checks.h =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/checks.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- checks.h 27 Aug 2003 19:18:45 -0000 1.3 +++ checks.h 25 Sep 2003 14:54:23 -0000 1.4 @@ -24,27 +24,27 @@ #ifndef CHECKS_HEADER #define CHECKS_HEADER 1 -BOOLEAN isa_data_partition_record(struct partition *p); -BOOLEAN isa_linux_raid_partition_record(struct partition *p); -BOOLEAN isa_zero_length_partition_record(struct partition *p); -BOOLEAN isa_null_partition_record(struct partition *p); -BOOLEAN isa_ebr_partition_record(struct partition *p); -BOOLEAN ptable_has_data_partition_record( Master_Boot_Record *mbr ); -BOOLEAN isa_mbr_partition_record(struct partition *p); -BOOLEAN ptable_has_partition_records( LOGICALDISK *ld, Master_Boot_Record *mbr ); -BOOLEAN isa_linux_swap_partition_record(LOGICALDISK *ld, struct partition *p, lba_t extd_partition_offset); -BOOLEAN has_guid_partition_table( Master_Boot_Record *mbr ); -BOOLEAN has_msdos_signature( Master_Boot_Record *mbr ); +boolean isa_data_partition_record(struct partition *p); +boolean isa_linux_raid_partition_record(struct partition *p); +boolean isa_zero_length_partition_record(struct partition *p); +boolean isa_null_partition_record(struct partition *p); +boolean isa_ebr_partition_record(struct partition *p); +boolean ptable_has_data_partition_record( Master_Boot_Record *mbr ); +boolean isa_mbr_partition_record(struct partition *p); +boolean ptable_has_partition_records( LOGICALDISK *ld, Master_Boot_Record *mbr ); +boolean isa_linux_swap_partition_record(LOGICALDISK *ld, struct partition *p, lba_t extd_partition_offset); +boolean has_guid_partition_table( Master_Boot_Record *mbr ); +boolean has_msdos_signature( Master_Boot_Record *mbr ); int isa_valid_partition_table_chain( LOGICALDISK *ld, Master_Boot_Record *mbr, lba_t mbr_lba, lba_t extd_partition_lba, - BOOLEAN ebr_chaining, + boolean ebr_chaining, int logical_count, - BOOLEAN final_call ); + boolean final_call ); -BOOLEAN partition_record_uses_lba_addressing( LOGICALDISK *ld, struct partition *part ); -BOOLEAN disk_uses_lba_addressing( LOGICALDISK *ld ); +boolean partition_record_uses_lba_addressing( LOGICALDISK *ld, struct partition *part ); +boolean disk_uses_lba_addressing( LOGICALDISK *ld ); #endif Index: commit.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/commit.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- commit.c 1 Sep 2003 17:40:51 -0000 1.12 +++ commit.c 25 Sep 2003 14:54:23 -0000 1.13 @@ -48,7 +48,7 @@ * Test if the mbr sector is zero cleared. Called by commit code to see * if we need to refresh the boot sector code. */ -static BOOLEAN isa_null_mbr_sector( void *mbr_sector ) +static boolean isa_null_mbr_sector( void *mbr_sector ) { int i; u_int32_t *ui_ptr = (u_int32_t *) mbr_sector; @@ -90,7 +90,7 @@ chs_t chs; - BOOLEAN ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; + boolean ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; lba_t start; u_int32_t size; @@ -276,7 +276,7 @@ chs_t chs; sector_count_t size; lba_t start_lba; - BOOLEAN ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; + boolean ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; LOG_ENTRY(); LOG_DEBUG("LBA= %"PRIu64"\n", ebr_seg->start ); Index: defsegmgr.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/defsegmgr.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- defsegmgr.c 23 Sep 2003 16:29:10 -0000 1.28 +++ defsegmgr.c 25 Sep 2003 14:54:23 -0000 1.29 @@ -257,7 +257,7 @@ * (2) Which means it is a segment and has necessarey ctl blocks * */ -static int SEG_can_set_volume(storage_object_t * seg, BOOLEAN flag ) +static int SEG_can_set_volume(storage_object_t * seg, boolean flag ) { int rc = EINVAL; LOGICALDISK *ld; @@ -378,7 +378,7 @@ (TAG) EXPAND_OBJECT_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc) { @@ -549,7 +549,7 @@ (TAG) SHRINK_OBJECT_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc) { @@ -671,7 +671,7 @@ * the input_object dlist must be copied to the output_object dlist. * */ -static int SEG_Discover( dlist_t input_objects, dlist_t output_objects, BOOLEAN final_call) +static int SEG_Discover( dlist_t input_objects, dlist_t output_objects, boolean final_call) { int rc = 0; int count = 0; @@ -700,7 +700,7 @@ * an MBR metadata segment and a FREESPACE segment. */ static int Assign_SegmentManager_ToDisk( LOGICALDISK *ld, - BOOLEAN isa_os2_disk, + boolean isa_os2_disk, char *disk_name ) { int rc; @@ -793,8 +793,8 @@ sector_count_t size, /* size in sectors */ sector_count_t sector_offset, /* sector offset in freespace seg */ u_int32_t partition_type, /* type, e.g. 0x83=linux ext2 */ - BOOLEAN Bootable, /* partition record active flag */ - BOOLEAN primary_partition, /* TRUE if it must be primary */ + boolean Bootable, /* partition record active flag */ + boolean primary_partition, /* TRUE if it must be primary */ char * partition_name, /* for OS2 partitions */ char * volume_name, /* for OS2 partitions */ char * drive_letter ) /* for OS2 partitions */ @@ -815,7 +815,7 @@ sector_count_t sizeof_freespace = free_space->size; lba_t startof_freespace = free_space->start; - BOOLEAN create_seg_on_cylinder_boundary = FALSE; + boolean create_seg_on_cylinder_boundary = FALSE; sector_count_t cylsize; sector_count_t trksize; @@ -1155,8 +1155,8 @@ sector_count_t * size, lsn_t * sector_offset, u_int32_t * type, - BOOLEAN * bootable, - BOOLEAN * primary_partition, + boolean * bootable, + boolean * primary_partition, char * partition_name, char * volume_name, char * drive_letter ) @@ -1302,7 +1302,7 @@ return rc; } -static int GetAssignOptions( option_array_t * options, char * disk_name , BOOLEAN *isa_os2_disk ) +static int GetAssignOptions( option_array_t * options, char * disk_name , boolean *isa_os2_disk ) { int i; int rc = EINVAL; @@ -1414,9 +1414,9 @@ sector_count_t size; sector_count_t sector_offset; u_int32_t type; - BOOLEAN bootable; - BOOLEAN primary_partition; - BOOLEAN created_disk = FALSE; + boolean bootable; + boolean primary_partition; + boolean created_disk = FALSE; char partition_name[EVMS_NAME_SIZE+1]; char volume_name[EVMS_VOLUME_NAME_SIZE+1]; char drive_letter[16]; @@ -1486,7 +1486,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc) { LOG_ERROR("dlist error inserting new object into the engine new_objects list.\n"); @@ -1543,7 +1543,7 @@ int rc; char disk_name[EVMS_NAME_SIZE+1]; - BOOLEAN isa_os2_disk=FALSE; + boolean isa_os2_disk=FALSE; LOGICALDISK *ld = (LOGICALDISK *) input_object; LOG_ENTRY(); @@ -2416,7 +2416,7 @@ * parameter indicates whether the volume is being created (TRUE) or * removed (FALSE). */ -static void SEG_set_volume(storage_object_t * object, BOOLEAN flag) +static void SEG_set_volume(storage_object_t * object, boolean flag) { return; } Index: discovery.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/discovery.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- discovery.c 1 Sep 2003 17:40:51 -0000 1.34 +++ discovery.c 25 Sep 2003 14:54:23 -0000 1.35 @@ -49,7 +49,7 @@ * Called to see if the drive has a MS-DOS partitioning scheme. This is * a simple MBR+EBR chain ... and possibly ... OS2 dlat sectors. */ -static BOOLEAN isa_disk_with_msdos_partitions( LOGICALDISK *ld, Master_Boot_Record *mbr ) +static boolean isa_disk_with_msdos_partitions( LOGICALDISK *ld, Master_Boot_Record *mbr ) { int rc=-1; DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data(ld); @@ -575,11 +575,11 @@ * done prior to aborting discovery. By returning TRUE for any * object we created, the object will be pruned from the dlist. */ -static BOOLEAN prune_our_objects_from_list( ADDRESS Object, +static boolean prune_our_objects_from_list( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { *FreeMemory = FALSE; // tells dlist not to free any memory @@ -611,14 +611,14 @@ DISK_PRIVATE_DATA *disk_pdata=NULL; SEG_PRIVATE_DATA *pdata=NULL; Master_Boot_Record *mbr = NULL; - BOOLEAN success=FALSE; + boolean success=FALSE; int rc=0; void *handle; TAG tag; uint segcount; dlist_t output_objects; struct plugin_functions_s *dft; - BOOLEAN acceptable_object = FALSE; + boolean acceptable_object = FALSE; LOG_ENTRY(); LOG_DEBUG("examining object %s\n", ((storage_object_t *)Object)->name ); @@ -681,7 +681,7 @@ (TAG) tag, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); @@ -734,7 +734,7 @@ (TAG) DISK_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); // get rid of the disk private data area we built @@ -871,7 +871,7 @@ (TAG) DISK_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); // get rid of the disk private data area we built Index: display.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/display.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- display.c 27 Aug 2003 19:18:46 -0000 1.5 +++ display.c 25 Sep 2003 14:54:23 -0000 1.6 @@ -126,7 +126,7 @@ void DisplayPartitionRecord( Partition_Record *part , int table_index, - BOOLEAN logical_partition ) + boolean logical_partition ) { char Type[21]; char Boot[5] = " "; @@ -215,7 +215,7 @@ } -void DisplayPartitionTable(LOGICALDISK *ld, Partition_Record *partptr , BOOLEAN mbr) +void DisplayPartitionTable(LOGICALDISK *ld, Partition_Record *partptr , boolean mbr) { int i; Partition_Record *part = partptr; Index: display.h =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/display.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- display.h 27 Aug 2003 19:18:46 -0000 1.3 +++ display.h 25 Sep 2003 14:54:23 -0000 1.4 @@ -25,9 +25,9 @@ #define DISPLAY_HEADER 1 -void DisplayPartitionRecord( Partition_Record *part, int table_index, BOOLEAN logical_partition ); +void DisplayPartitionRecord( Partition_Record *part, int table_index, boolean logical_partition ); void DisplayDiskSegmentList(LOGICALDISK *ld); -void DisplayPartitionTable(LOGICALDISK *ld, Partition_Record *partptr , BOOLEAN mbr); +void DisplayPartitionTable(LOGICALDISK *ld, Partition_Record *partptr , boolean mbr); #endif Index: embedded.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/embedded.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- embedded.c 1 Sep 2003 17:40:51 -0000 1.9 +++ embedded.c 25 Sep 2003 14:54:23 -0000 1.10 @@ -103,7 +103,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); @@ -217,7 +217,7 @@ struct plugin_functions_s *dft; int i; Partition_Record *part; - BOOLEAN success=FALSE; + boolean success=FALSE; LOG_ENTRY(); Index: move.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/move.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- move.c 1 Sep 2003 17:40:51 -0000 1.10 +++ move.c 25 Sep 2003 14:54:23 -0000 1.11 @@ -49,7 +49,7 @@ * Called to determine if it would be Ok to move * the sepcified segment object. */ -static inline BOOLEAN safe_to_move(DISKSEG *seg) +static inline boolean safe_to_move(DISKSEG *seg) { LOGICALDISK *ld=get_logical_disk(seg); DISK_PRIVATE_DATA *disk_pdata=NULL; @@ -267,7 +267,7 @@ static int create_move_target( DISKSEG *seg, // source data segment DISKSEG *freespace, // target freespace segment DISKSEG **target, // where to return move target storage object - BOOLEAN testing ) // testing == TRUE if we just want to test + boolean testing ) // testing == TRUE if we just want to test { // if a move object could be created and LOGICALDISK *ld=NULL; // dont actually want the object returned DISKSEG *trg=NULL; @@ -550,7 +550,7 @@ SEG_PRIVATE_DATA *trg_pdata=NULL; SEG_PRIVATE_DATA *trg_ebr_pdata=NULL; SEG_PRIVATE_DATA *ebr_pdata=NULL; - BOOLEAN logical_partition=FALSE; + boolean logical_partition=FALSE; LOG_ENTRY(); Index: os2dlat.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/os2dlat.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- os2dlat.c 1 Sep 2003 17:40:51 -0000 1.7 +++ os2dlat.c 25 Sep 2003 14:54:23 -0000 1.8 @@ -409,7 +409,7 @@ * * Returns: TRUE if there is a mapping between the DLAT and PTABLE */ -static BOOLEAN dla_matches_ptable( Master_Boot_Record *mbr, +static boolean dla_matches_ptable( Master_Boot_Record *mbr, DLA_Table_Sector *DLA_Table, lba_t mbr_lba ) { @@ -417,8 +417,8 @@ int j; lba_t PartStartLba; u_int32_t PartSize; - BOOLEAN partition_mapped[4] = {FALSE, FALSE, FALSE, FALSE }; - BOOLEAN dla_maps_a_partition; + boolean partition_mapped[4] = {FALSE, FALSE, FALSE, FALSE }; + boolean dla_maps_a_partition; DLA_Entry *dla; Partition_Record *part; @@ -508,7 +508,7 @@ * the dla table maps back to the partition table. This will account for differnt * table entrie and also different number of entries. */ -static BOOLEAN isa_valid_OS2_DLAT( LOGICALDISK *ld, +static boolean isa_valid_OS2_DLAT( LOGICALDISK *ld, Master_Boot_Record *mbr, DLA_Table_Sector *DLA_Table, lba_t mbr_lba, @@ -569,7 +569,7 @@ * may differ from the ordering of the entries in the corresponding partition table. * */ -BOOLEAN isa_os2_partitioned_disk( LOGICALDISK *ld, +boolean isa_os2_partitioned_disk( LOGICALDISK *ld, Master_Boot_Record *mbr, lba_t mbr_lba, lba_t extd_partition_lba ) @@ -579,7 +579,7 @@ lba_t ebr_lba; Extended_Boot_Record *ebr = NULL; DLA_Table_Sector *dlat_buffer = NULL; - BOOLEAN rc; + boolean rc; struct plugin_functions_s *dft; DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data(ld); Index: os2dlat.h =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/os2dlat.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- os2dlat.h 27 Aug 2003 19:18:46 -0000 1.3 +++ os2dlat.h 25 Sep 2003 14:54:23 -0000 1.4 @@ -34,7 +34,7 @@ int Write_Dlat_Sector( LOGICALDISK *ld, DISKSEG *boot_seg ); -BOOLEAN isa_os2_partitioned_disk( LOGICALDISK *ld, +boolean isa_os2_partitioned_disk( LOGICALDISK *ld, Master_Boot_Record *mbr, lba_t mbr_lba, lba_t extd_partition_lba ); Index: ptables.h =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/ptables.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ptables.h 6 Sep 2003 13:51:30 -0000 1.11 +++ ptables.h 25 Sep 2003 14:54:23 -0000 1.12 @@ -81,8 +81,8 @@ u_int32_t Partition_Serial_Number; /* The serial number of this partition. */ u_int32_t Partition_Size; /* The size of the partition, in sectors. */ u_int32_t Partition_Start; /* The starting sector of the partition. */ -BOOLEAN On_Boot_Manager_Menu; /* Set to TRUE if this volume/partition is on the Boot Manager Menu. */ -BOOLEAN Installable; /* Set to TRUE if this volume is the one to install the operating system on. */ +boolean On_Boot_Manager_Menu; /* Set to TRUE if this volume/partition is on the Boot Manager Menu. */ +boolean Installable; /* Set to TRUE if this volume is the one to install the operating system on. */ char Drive_Letter; /* The drive letter assigned to the partition. */ char Reserved; char Volume_Name[VOLUME_NAME_SIZE]; /* The name assigned to the volume by the user. */ @@ -100,7 +100,7 @@ u_int32_t Heads_Per_Cylinder; u_int32_t Sectors_Per_Track; char Disk_Name[DISK_NAME_SIZE]; /* The name assigned to the disk containing this sector. */ -BOOLEAN Reboot; /* For use by Install. Used to keep track of reboots initiated by install. */ +boolean Reboot; /* For use by Install. Used to keep track of reboots initiated by install. */ char Reserved[3]; /* Alignment. */ DLA_Entry DLA_Array[4]; /* These are the four entries which correspond to the entries in the partition table. */ } DLA_Table_Sector; Index: resolver.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/resolver.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- resolver.c 23 Sep 2003 16:40:49 -0000 1.10 +++ resolver.c 25 Sep 2003 14:54:23 -0000 1.11 @@ -98,7 +98,7 @@ * Called to test if two segment storage objects have matching * metadata ... starting LBA and SIZE. */ -static inline BOOLEAN matching_metadata( DISKSEG *kernel_seg, DISKSEG *engine_seg ) +static inline boolean matching_metadata( DISKSEG *kernel_seg, DISKSEG *engine_seg ) { if ( kernel_seg->start == engine_seg->start && kernel_seg->size == engine_seg->size ) { @@ -240,7 +240,7 @@ * call, by simply checking for device major minor numbers which * would indicate that DM has a device node for the objecct. */ -static inline BOOLEAN isa_existing_dm_segment( DISKSEG *seg ) +static inline boolean isa_existing_dm_segment( DISKSEG *seg ) { LOG_DEBUG("test if seg %s exists\n", seg->name); if ( seg->dev_major==0 && seg->dev_minor==0) { @@ -451,10 +451,10 @@ seglist_t *elist=NULL; int minor=0,last_engine_minor=0; DISKSEG *seg=NULL; - BOOLEAN found=FALSE; + boolean found=FALSE; int rc=0; storage_container_t * disk_group = NULL; - BOOLEAN got_disk_group=FALSE; + boolean got_disk_group=FALSE; LOG_ENTRY(); Index: segoptions.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/segoptions.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- segoptions.c 1 Sep 2003 17:40:51 -0000 1.14 +++ segoptions.c 25 Sep 2003 14:54:23 -0000 1.15 @@ -70,7 +70,7 @@ /* * Returns TRUE if the specified Drive Letter is valid letter C-Z */ -static BOOLEAN isa_valid_drive_letter( char *drive_letter ) +static boolean isa_valid_drive_letter( char *drive_letter ) { LOG_ENTRY(); @@ -228,7 +228,7 @@ sector_count_t MaxSize; sector_count_t CylinderSize=0; DISK_PRIVATE_DATA *disk_pdata; - BOOLEAN OS2_Disk = FALSE; + boolean OS2_Disk = FALSE; DISKSEG *mbr; LOG_ENTRY(); @@ -1926,7 +1926,7 @@ * * Note ... if there is more than 1 object in the source object list we will simply * take the first good object and decline the remainder. That is the reason for - * the BOOLEAN flag found_good_object. + * the boolean flag found_good_object. */ static int set_assign_object( task_context_t * context, dlist_t declined_objects, @@ -2029,7 +2029,7 @@ * * Note ... if there is more than 1 object in the source object list we will simply * take the first good object and decline the remainder. That is the reason for - * the BOOLEAN flag found_good_object. + * the boolean flag found_good_object. */ static int set_create_object( task_context_t * context, dlist_t declined_objects, @@ -2149,7 +2149,7 @@ storage_object_t *freespace; void *handle; LOGICALDISK *ld; - BOOLEAN found_good_object = FALSE; + boolean found_good_object = FALSE; declined_object_t *declined_object=NULL; @@ -2267,7 +2267,7 @@ storage_object_t *obj; void *handle; LOGICALDISK *ld; - BOOLEAN found_good_object = FALSE; + boolean found_good_object = FALSE; declined_object_t *declined_object=NULL; @@ -2372,7 +2372,7 @@ int rc; DISKSEG *seg; void *handle; - BOOLEAN found_good_object = FALSE; + boolean found_good_object = FALSE; declined_object_t *declined_object=NULL; @@ -2528,11 +2528,11 @@ * * */ -static BOOLEAN prune_acceptable_disks( ADDRESS Object, +static boolean prune_acceptable_disks( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { storage_object_t *obj = (storage_object_t *)Object; @@ -2638,11 +2638,11 @@ * This is so we only present FREESPACE segments that are truly acceptable * for CREATE. */ -static BOOLEAN prune_small_segs( ADDRESS Object, +static boolean prune_small_segs( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { LOGICALDISK *ld; @@ -2899,11 +2899,11 @@ * any segment that cannot be moved from a list of * segments. */ -static BOOLEAN prune_invalid_move_targets( ADDRESS Object, +static boolean prune_invalid_move_targets( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { LOGICALDISK *ld1=NULL; Index: segs.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/segs.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- segs.c 1 Sep 2003 17:40:52 -0000 1.17 +++ segs.c 25 Sep 2003 14:54:23 -0000 1.18 @@ -303,7 +303,7 @@ (TAG) DISK_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); } @@ -314,7 +314,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); } @@ -425,7 +425,7 @@ (TAG) DISK_PDATA_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); } else { @@ -449,11 +449,11 @@ return rc; } -BOOLEAN dos_prune_deactivate_objects( ADDRESS Object, +boolean dos_prune_deactivate_objects( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { *FreeMemory = FALSE; // tells dlist not to free any memory @@ -548,10 +548,10 @@ /* * Returns TRUE if the disk has an extended partition */ -BOOLEAN disk_has_extended_partition(LOGICALDISK *ld) +boolean disk_has_extended_partition(LOGICALDISK *ld) { SEG_PRIVATE_DATA *pdata; - BOOLEAN rc=FALSE; + boolean rc=FALSE; DISKSEG *mbr; @@ -578,7 +578,7 @@ * Returns TRUE if the disk segment list has a META_DATA segment * that is an MBR track. */ -BOOLEAN seglist_has_mbr_segment( dlist_t seglist ) +boolean seglist_has_mbr_segment( dlist_t seglist ) { if ( get_mbr_from_seglist(seglist)==NULL ) { return FALSE; @@ -641,7 +641,7 @@ DISKSEG *seg; int rc = -1; SEG_PRIVATE_DATA *pdata; - BOOLEAN ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; + boolean ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; int i; LOGICALDISK *ld = get_logical_disk(ebr); DISK_PRIVATE_DATA *disk_pdata; @@ -775,7 +775,7 @@ DISKSEG *seg; int rc = -1; SEG_PRIVATE_DATA *pdata; - BOOLEAN ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; + boolean ptable_entry_in_use[4] = {FALSE,FALSE,FALSE,FALSE}; int i; LOGICALDISK *ld = get_logical_disk(mbr); DISK_PRIVATE_DATA *disk_pdata; @@ -1441,7 +1441,7 @@ DISKSEG *ebr, lba_t ebr_lba, u_int32_t ptable_index, - BOOLEAN primary_partition_flag ) + boolean primary_partition_flag ) { Partition_Record pr; DISKSEG *new_ebr=NULL; @@ -1544,7 +1544,7 @@ Partition_Record *part, DISKSEG *ebr, u_int32_t ptable_index, - BOOLEAN primary_partition ) + boolean primary_partition ) { DISKSEG *seg = NULL; SEG_PRIVATE_DATA *pdata = NULL; @@ -1872,7 +1872,7 @@ SEG_PRIVATE_DATA *seg2_pdata; lba_t seg2_end_lba; lba_t seg_end_lba; - BOOLEAN overlapping=FALSE; + boolean overlapping=FALSE; DISK_PRIVATE_DATA *disk_pdata=NULL; @@ -2029,7 +2029,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); break; @@ -2043,7 +2043,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) AppendToList, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); break; @@ -2819,11 +2819,11 @@ * any segment that cannot be moved from a list of * segments. */ -static BOOLEAN prune_zero_length_freespace_segs( ADDRESS Object, +static boolean prune_zero_length_freespace_segs( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ) { DISKSEG *seg = (storage_object_t *)Object; @@ -2903,7 +2903,7 @@ SEG_PRIVATE_DATA *pdata=NULL; sector_count_t offset; sector_count_t track_size; - BOOLEAN cleanup_freespace=FALSE; + boolean cleanup_freespace=FALSE; lba_t track_ending_lba=0; lba_t track_starting_lba=0; lba_t ebr_start=0; @@ -3319,7 +3319,7 @@ void *handle; DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data( ld ); DLA_Table_Sector *dlat_buffer = NULL; - BOOLEAN split_logical_drive = FALSE; + boolean split_logical_drive = FALSE; lba_t seg_end = seg->start + seg->size - 1; LOG_ENTRY(); @@ -3553,12 +3553,12 @@ * on the drive. This question is asked by SEG create code to help it determine if the * new SEG should be a logical drive or not. */ -BOOLEAN seg_is_within_or_adjacant_to_extended_partition( LOGICALDISK *ld, DISKSEG *seg ) +boolean seg_is_within_or_adjacant_to_extended_partition( LOGICALDISK *ld, DISKSEG *seg ) { DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data(ld); DISKSEG *this_seg; SEG_PRIVATE_DATA *pdata; - BOOLEAN rc = FALSE; + boolean rc = FALSE; int error; lba_t extd_start; lba_t extd_end; @@ -3678,7 +3678,7 @@ * Called because the disk doesn't have an MBR yet. So, we create one, hang * it off the disk, and fill in a DLAT sector. */ -int create_mbr_For_Disk( LOGICALDISK *ld, char *DiskName, BOOLEAN isa_os2_disk ) +int create_mbr_For_Disk( LOGICALDISK *ld, char *DiskName, boolean isa_os2_disk ) { DISKSEG *mbr; DISKSEG *freeseg; @@ -3814,7 +3814,7 @@ * Returns TRUE if the specified disk segment falls within the extended partition * extent on the drive. */ -BOOLEAN seg_is_within_the_extended_partition( LOGICALDISK *ld, DISKSEG *seg ) +boolean seg_is_within_the_extended_partition( LOGICALDISK *ld, DISKSEG *seg ) { DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data(ld); @@ -3838,7 +3838,7 @@ /* * Called to see if a segment can be resized */ -BOOLEAN seg_is_volitile( DISKSEG *seg ) +boolean seg_is_volitile( DISKSEG *seg ) { SEG_PRIVATE_DATA *pdata = (SEG_PRIVATE_DATA *)seg->private_data; LOGICALDISK *ld = get_logical_disk(seg); @@ -3937,7 +3937,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc == DLIST_SUCCESS) { @@ -3996,7 +3996,7 @@ * FALSE otherwise * */ -BOOLEAN seg_is_within_container_segment( DISKSEG *seg ) +boolean seg_is_within_container_segment( DISKSEG *seg ) { DISKSEG *container_seg; LOGICALDISK *ld; @@ -4063,13 +4063,13 @@ * FALSE otherwise * */ -BOOLEAN seg_overlaps_container_segment( DISKSEG *seg ) +boolean seg_overlaps_container_segment( DISKSEG *seg ) { DISKSEG *container_seg; LOGICALDISK *ld; DISK_PRIVATE_DATA *disk_pdata; int rc; - BOOLEAN overlapping=FALSE; + boolean overlapping=FALSE; LOG_ENTRY(); Index: segs.h =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/segs.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- segs.h 27 Aug 2003 19:18:46 -0000 1.7 +++ segs.h 25 Sep 2003 14:54:23 -0000 1.8 @@ -37,8 +37,8 @@ int delete_disk_private_data( LOGICALDISK *ld ); DISK_PRIVATE_DATA *get_disk_private_data( LOGICALDISK *ld ); -BOOLEAN disk_has_extended_partition( LOGICALDISK *ld ); -BOOLEAN seglist_has_mbr_segment( dlist_t seglist ); +boolean disk_has_extended_partition( LOGICALDISK *ld ); +boolean seglist_has_mbr_segment( dlist_t seglist ); DISKSEG * get_mbr_from_seglist( dlist_t seglist ); int get_first_unused_ptable_entry( dlist_t seglist, DISKSEG *ebr ); @@ -46,7 +46,7 @@ DISKSEG * get_first_freespace_seg_in_list( dlist_t seglist ); -BOOLEAN freespace_follows_seg( DISKSEG *seg ); +boolean freespace_follows_seg( DISKSEG *seg ); DISKSEG * get_freespace_following_seg( DISKSEG *seg ); DISKSEG * find_freespace_in_seglist( dlist_t seglist ); @@ -57,21 +57,21 @@ void * insert_diskseg_into_ordered_list( dlist_t seglist, DISKSEG *seg); int merge_adjacent_freedisksegs_in_list( dlist_t seglist ); -int create_mbr_For_Disk( LOGICALDISK *ld, char *DiskName, BOOLEAN isa_os2_disk ); +int create_mbr_For_Disk( LOGICALDISK *ld, char *DiskName, boolean isa_os2_disk ); DISKSEG * build_mbr_disk_segment( LOGICALDISK *ld ); DISKSEG * build_ebr_disk_segment( LOGICALDISK *ld, Partition_Record *part, DISKSEG *ebr, lba_t ebr_lba, u_int32_t ptable_index, - BOOLEAN primary_partition_flag ); + boolean primary_partition_flag ); DISKSEG * build_diskseg_from_partition_record( LOGICALDISK *ld, Partition_Record *part, DISKSEG *ebr, u_int32_t ptable_index, - BOOLEAN primary_partition_flag ); + boolean primary_partition_flag ); int fixup_logical_partition_names( LOGICALDISK *ld ); @@ -84,25 +84,25 @@ int create_logical_partition( LOGICALDISK *ld, DISKSEG *seg, DLA_Entry *dla, DISKSEG *freespace, sector_count_t offset ); int create_primary_partition( LOGICALDISK *ld, DISKSEG *seg, DLA_Entry *dla ); -BOOLEAN seg_is_within_or_adjacant_to_extended_partition( LOGICALDISK *ld, DISKSEG *seg ); -BOOLEAN seg_is_within_the_extended_partition( LOGICALDISK *ld, DISKSEG *seg ); +boolean seg_is_within_or_adjacant_to_extended_partition( LOGICALDISK *ld, DISKSEG *seg ); +boolean seg_is_within_the_extended_partition( LOGICALDISK *ld, DISKSEG *seg ); -BOOLEAN seg_is_volitile( DISKSEG *seg ); +boolean seg_is_volitile( DISKSEG *seg ); int diskseg_to_container_segment( DISKSEG *seg ); void revert_container_segment( DISKSEG *seg ); -BOOLEAN seg_is_within_container_segment( DISKSEG *seg ); -BOOLEAN seg_overlaps_container_segment( DISKSEG *seg ); +boolean seg_is_within_container_segment( DISKSEG *seg ); +boolean seg_overlaps_container_segment( DISKSEG *seg ); int remove_container_seg_overlap( DISKSEG *seg); DISKSEG * only_child( DISKSEG *seg ); -BOOLEAN dos_prune_deactivate_objects( ADDRESS Object, +boolean dos_prune_deactivate_objects( ADDRESS Object, TAG ObjectTag, ADDRESS ObjectHandle, ADDRESS Parameters, - BOOLEAN *FreeMemory, + boolean *FreeMemory, uint *Error ); @@ -295,7 +295,7 @@ /* * Returns TRUE if the LBA starts on a cylinder boundary */ -static inline BOOLEAN starts_on_cylinder_boundary( LOGICALDISK *ld, lba_t lba ) +static inline boolean starts_on_cylinder_boundary( LOGICALDISK *ld, lba_t lba ) { chs_t chs; @@ -318,7 +318,7 @@ /* * Returns TRUE if the LBA ends on a cylinder boundary */ -static inline BOOLEAN ends_on_cylinder_boundary( LOGICALDISK *ld, lba_t lba ) +static inline boolean ends_on_cylinder_boundary( LOGICALDISK *ld, lba_t lba ) { chs_t chs; DISK_PRIVATE_DATA *disk_pdata = get_disk_private_data( ld ); @@ -504,7 +504,7 @@ * Tests if the stated LBA is below the 1024 cylinder limit on * the drive. */ -static inline BOOLEAN below_1024_cylinder_limit(LOGICALDISK *ld, lba_t lba ) +static inline boolean below_1024_cylinder_limit(LOGICALDISK *ld, lba_t lba ) { chs_t chs; @@ -529,7 +529,7 @@ /* * Called to test if we have private data for a disk. */ -static inline BOOLEAN i_can_modify_disk( LOGICALDISK *ld ) +static inline boolean i_can_modify_disk( LOGICALDISK *ld ) { DISK_PRIVATE_DATA *disk_pdata; @@ -554,7 +554,7 @@ * Called to test if we own the specified disk segment and can * work with the segment. */ -static inline BOOLEAN i_can_modify_seg( DISKSEG *seg ) +static inline boolean i_can_modify_seg( DISKSEG *seg ) { if (seg) { @@ -582,7 +582,7 @@ -static inline BOOLEAN disk_move_pending( storage_object_t *object ) +static inline boolean disk_move_pending( storage_object_t *object ) { LOGICALDISK *ld=get_logical_disk(object); DISK_PRIVATE_DATA *disk_pdata=NULL; Index: solarisX86.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/solarisX86.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- solarisX86.c 1 Sep 2003 17:40:52 -0000 1.7 +++ solarisX86.c 25 Sep 2003 14:54:23 -0000 1.8 @@ -71,7 +71,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc != DLIST_SUCCESS) { Index: unixware.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/dos/unixware.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- unixware.c 1 Sep 2003 17:40:52 -0000 1.7 +++ unixware.c 25 Sep 2003 14:54:23 -0000 1.8 @@ -70,7 +70,7 @@ (TAG) SEGMENT_TAG, (void *) NULL, (Insertion_Modes) InsertBefore, - (BOOLEAN) TRUE, + (boolean) TRUE, (void **) &handle ); if (rc != DLIST_SUCCESS) { |