| device.h | | device.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1998 - 2001, 2005, 2007-2008 Free Software Foundation, In | | Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2012 Free Software | |
| c. | | Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 32 | | skipping to change at line 33 | |
| */ | | */ | |
| | | | |
| /** \file device.h */ | | /** \file device.h */ | |
| | | | |
| #ifndef PED_DEVICE_H_INCLUDED | | #ifndef PED_DEVICE_H_INCLUDED | |
| #define PED_DEVICE_H_INCLUDED | | #define PED_DEVICE_H_INCLUDED | |
| | | | |
| /** We can address 2^63 sectors */ | | /** We can address 2^63 sectors */ | |
| typedef long long PedSector; | | typedef long long PedSector; | |
| | | | |
|
| /** \deprecated Removal from API planned */ | | | |
| typedef enum { | | typedef enum { | |
| PED_DEVICE_UNKNOWN = 0, | | PED_DEVICE_UNKNOWN = 0, | |
| PED_DEVICE_SCSI = 1, | | PED_DEVICE_SCSI = 1, | |
| PED_DEVICE_IDE = 2, | | PED_DEVICE_IDE = 2, | |
| PED_DEVICE_DAC960 = 3, | | PED_DEVICE_DAC960 = 3, | |
| PED_DEVICE_CPQARRAY = 4, | | PED_DEVICE_CPQARRAY = 4, | |
| PED_DEVICE_FILE = 5, | | PED_DEVICE_FILE = 5, | |
| PED_DEVICE_ATARAID = 6, | | PED_DEVICE_ATARAID = 6, | |
| PED_DEVICE_I2O = 7, | | PED_DEVICE_I2O = 7, | |
| PED_DEVICE_UBD = 8, | | PED_DEVICE_UBD = 8, | |
| PED_DEVICE_DASD = 9, | | PED_DEVICE_DASD = 9, | |
| PED_DEVICE_VIODASD = 10, | | PED_DEVICE_VIODASD = 10, | |
| PED_DEVICE_SX8 = 11, | | PED_DEVICE_SX8 = 11, | |
| PED_DEVICE_DM = 12, | | PED_DEVICE_DM = 12, | |
| PED_DEVICE_XVD = 13, | | PED_DEVICE_XVD = 13, | |
| PED_DEVICE_SDMMC = 14, | | PED_DEVICE_SDMMC = 14, | |
| PED_DEVICE_VIRTBLK = 15, | | PED_DEVICE_VIRTBLK = 15, | |
| PED_DEVICE_AOE = 16, | | PED_DEVICE_AOE = 16, | |
|
| PED_DEVICE_MD = 17 | | PED_DEVICE_MD = 17, | |
| | | PED_DEVICE_LOOP = 18 | |
| } PedDeviceType; | | } PedDeviceType; | |
| | | | |
| typedef struct _PedDevice PedDevice; | | typedef struct _PedDevice PedDevice; | |
| typedef struct _PedDeviceArchOps PedDeviceArchOps; | | typedef struct _PedDeviceArchOps PedDeviceArchOps; | |
| typedef struct _PedCHSGeometry PedCHSGeometry; | | typedef struct _PedCHSGeometry PedCHSGeometry; | |
| | | | |
| /** | | /** | |
| * A cylinder-head-sector "old-style" geometry. | | * A cylinder-head-sector "old-style" geometry. | |
| * | | * | |
| * A device addressed in this way has C*H*S sectors. | | * A device addressed in this way has C*H*S sectors. | |
| | | | |
| skipping to change at line 77 | | skipping to change at line 78 | |
| }; | | }; | |
| | | | |
| /** A block device - for example, /dev/hda, not /dev/hda3 */ | | /** A block device - for example, /dev/hda, not /dev/hda3 */ | |
| struct _PedDevice { | | struct _PedDevice { | |
| PedDevice* next; | | PedDevice* next; | |
| | | | |
| char* model; /**< \brief description of hardware | | char* model; /**< \brief description of hardware | |
| (manufacturer, model) */ | | (manufacturer, model) */ | |
| char* path; /**< device /dev entry */ | | char* path; /**< device /dev entry */ | |
| | | | |
|
| PedDeviceType type; /**< SCSI, IDE, etc. | | PedDeviceType type; /**< SCSI, IDE, etc. \sa PedDeviceT | |
| \deprecated \sa PedDeviceType | | ype */ | |
| */ | | | |
| long long sector_size; /**< logical sector size */ | | long long sector_size; /**< logical sector size */ | |
| long long phys_sector_size; /**< physical sector size *
/ | | long long phys_sector_size; /**< physical sector size *
/ | |
| PedSector length; /**< device length (LBA) */ | | PedSector length; /**< device length (LBA) */ | |
| | | | |
| int open_count; /**< the number of times this device ha
s | | int open_count; /**< the number of times this device ha
s | |
| been opened with ped_device_open()
. */ | | been opened with ped_device_open()
. */ | |
| int read_only; | | int read_only; | |
| int external_mode; | | int external_mode; | |
| int dirty; | | int dirty; | |
| int boot_dirty; | | int boot_dirty; | |
| | | | |
| skipping to change at line 131 | | skipping to change at line 131 | |
| PedAlignment *(*get_optimum_alignment)(const PedDevice *dev); | | PedAlignment *(*get_optimum_alignment)(const PedDevice *dev); | |
| }; | | }; | |
| | | | |
| #include <parted/constraint.h> | | #include <parted/constraint.h> | |
| #include <parted/timer.h> | | #include <parted/timer.h> | |
| | | | |
| extern void ped_device_probe_all (); | | extern void ped_device_probe_all (); | |
| extern void ped_device_free_all (); | | extern void ped_device_free_all (); | |
| | | | |
| extern PedDevice* ped_device_get (const char* name); | | extern PedDevice* ped_device_get (const char* name); | |
|
| extern PedDevice* ped_device_get_next (const PedDevice* dev); | | extern PedDevice* ped_device_get_next (const PedDevice* dev) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_device_is_busy (PedDevice* dev); | | extern int ped_device_is_busy (PedDevice* dev); | |
| extern int ped_device_open (PedDevice* dev); | | extern int ped_device_open (PedDevice* dev); | |
| extern int ped_device_close (PedDevice* dev); | | extern int ped_device_close (PedDevice* dev); | |
| extern void ped_device_destroy (PedDevice* dev); | | extern void ped_device_destroy (PedDevice* dev); | |
| extern void ped_device_cache_remove (PedDevice* dev); | | extern void ped_device_cache_remove (PedDevice* dev); | |
| | | | |
| extern int ped_device_begin_external_access (PedDevice* dev); | | extern int ped_device_begin_external_access (PedDevice* dev); | |
| extern int ped_device_end_external_access (PedDevice* dev); | | extern int ped_device_end_external_access (PedDevice* dev); | |
| | | | |
| extern int ped_device_read (const PedDevice* dev, void* buffer, | | extern int ped_device_read (const PedDevice* dev, void* buffer, | |
| | | | |
End of changes. 5 change blocks. |
| 8 lines changed or deleted | | 11 lines changed or added | |
|
| disk.h | | disk.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1999-2002, 2007-2011 Free Software Foundation, Inc. | | Copyright (C) 1999-2002, 2007-2012 Free Software Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 39 | | skipping to change at line 39 | |
| /** | | /** | |
| * Disk flags | | * Disk flags | |
| */ | | */ | |
| enum _PedDiskFlag { | | enum _PedDiskFlag { | |
| /* This flag (which defaults to true) controls if disk types for | | /* This flag (which defaults to true) controls if disk types for | |
| which cylinder alignment is optional do cylinder alignment when
a | | which cylinder alignment is optional do cylinder alignment when
a | |
| new partition gets added. | | new partition gets added. | |
| This flag is available for msdos and sun disklabels (for sun lab
els | | This flag is available for msdos and sun disklabels (for sun lab
els | |
| it only controls the aligning of the end of the partition) */ | | it only controls the aligning of the end of the partition) */ | |
| PED_DISK_CYLINDER_ALIGNMENT=1, | | PED_DISK_CYLINDER_ALIGNMENT=1, | |
|
| | | /* This flag controls whether the boot flag of a GPT PMBR is set */ | |
| | | PED_DISK_GPT_PMBR_BOOT=2, | |
| }; | | }; | |
| #define PED_DISK_FIRST_FLAG PED_DISK_CYLINDER_ALIGNMENT | | #define PED_DISK_FIRST_FLAG PED_DISK_CYLINDER_ALIGNMENT | |
|
| #define PED_DISK_LAST_FLAG PED_DISK_CYLINDER_ALIGNMENT | | #define PED_DISK_LAST_FLAG PED_DISK_GPT_PMBR_BOOT | |
| | | | |
| /** | | /** | |
| * Partition types | | * Partition types | |
| */ | | */ | |
| enum _PedPartitionType { | | enum _PedPartitionType { | |
| PED_PARTITION_NORMAL = 0x00, | | PED_PARTITION_NORMAL = 0x00, | |
| PED_PARTITION_LOGICAL = 0x01, | | PED_PARTITION_LOGICAL = 0x01, | |
| PED_PARTITION_EXTENDED = 0x02, | | PED_PARTITION_EXTENDED = 0x02, | |
| PED_PARTITION_FREESPACE = 0x04, | | PED_PARTITION_FREESPACE = 0x04, | |
| PED_PARTITION_METADATA = 0x08, | | PED_PARTITION_METADATA = 0x08, | |
| | | | |
| skipping to change at line 272 | | skipping to change at line 274 | |
| */ | | */ | |
| struct _PedDiskArchOps { | | struct _PedDiskArchOps { | |
| char* (*partition_get_path) (const PedPartition* part); | | char* (*partition_get_path) (const PedPartition* part); | |
| int (*partition_is_busy) (const PedPartition* part); | | int (*partition_is_busy) (const PedPartition* part); | |
| int (*disk_commit) (PedDisk* disk); | | int (*disk_commit) (PedDisk* disk); | |
| }; | | }; | |
| | | | |
| extern void ped_disk_type_register (PedDiskType* type); | | extern void ped_disk_type_register (PedDiskType* type); | |
| extern void ped_disk_type_unregister (PedDiskType* type); | | extern void ped_disk_type_unregister (PedDiskType* type); | |
| | | | |
|
| extern PedDiskType* ped_disk_type_get_next (PedDiskType const *type); | | extern PedDiskType* ped_disk_type_get_next (PedDiskType const *type) | |
| extern PedDiskType* ped_disk_type_get (const char* name); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedDiskType* ped_disk_type_get (const char* name) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_disk_type_check_feature (const PedDiskType* disk_type, | | extern int ped_disk_type_check_feature (const PedDiskType* disk_type, | |
|
| PedDiskTypeFeature feature); | | PedDiskTypeFeature feature) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern PedDiskType* ped_disk_probe (PedDevice* dev); | | extern PedDiskType* ped_disk_probe (PedDevice* dev); | |
| extern int ped_disk_clobber (PedDevice* dev); | | extern int ped_disk_clobber (PedDevice* dev); | |
| extern PedDisk* ped_disk_new (PedDevice* dev); | | extern PedDisk* ped_disk_new (PedDevice* dev); | |
| extern PedDisk* ped_disk_new_fresh (PedDevice* dev, | | extern PedDisk* ped_disk_new_fresh (PedDevice* dev, | |
| const PedDiskType* disk_type); | | const PedDiskType* disk_type); | |
| extern PedDisk* ped_disk_duplicate (const PedDisk* old_disk); | | extern PedDisk* ped_disk_duplicate (const PedDisk* old_disk); | |
| extern void ped_disk_destroy (PedDisk* disk); | | extern void ped_disk_destroy (PedDisk* disk); | |
| extern int ped_disk_commit (PedDisk* disk); | | extern int ped_disk_commit (PedDisk* disk); | |
| extern int ped_disk_commit_to_dev (PedDisk* disk); | | extern int ped_disk_commit_to_dev (PedDisk* disk); | |
| extern int ped_disk_commit_to_os (PedDisk* disk); | | extern int ped_disk_commit_to_os (PedDisk* disk); | |
| extern int ped_disk_check (const PedDisk* disk); | | extern int ped_disk_check (const PedDisk* disk); | |
| extern void ped_disk_print (const PedDisk* disk); | | extern void ped_disk_print (const PedDisk* disk); | |
| | | | |
|
| extern int ped_disk_get_primary_partition_count (const PedDisk* disk); | | extern int ped_disk_get_primary_partition_count (const PedDisk* disk) | |
| extern int ped_disk_get_last_partition_num (const PedDisk* disk); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | extern int ped_disk_get_last_partition_num (const PedDisk* disk) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_disk_get_max_primary_partition_count (const PedDisk* disk); | | extern int ped_disk_get_max_primary_partition_count (const PedDisk* disk); | |
| extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk, | | extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk, | |
| int* supported); | | int* supported); | |
| extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk); | | extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk); | |
| | | | |
| extern int ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state); | | extern int ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state); | |
| extern int ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag); | | extern int ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag); | |
| extern int ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag
); | | extern int ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag
); | |
| | | | |
| extern const char *ped_disk_flag_get_name(PedDiskFlag flag); | | extern const char *ped_disk_flag_get_name(PedDiskFlag flag); | |
| extern PedDiskFlag ped_disk_flag_get_by_name(const char *name); | | extern PedDiskFlag ped_disk_flag_get_by_name(const char *name); | |
|
| extern PedDiskFlag ped_disk_flag_next(PedDiskFlag flag); | | extern PedDiskFlag ped_disk_flag_next(PedDiskFlag flag) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| /** @} */ | | /** @} */ | |
| | | | |
| /** | | /** | |
| * \addtogroup PedPartition | | * \addtogroup PedPartition | |
| * | | * | |
| * @{ | | * @{ | |
| */ | | */ | |
| | | | |
| extern PedPartition* ped_partition_new (const PedDisk* disk, | | extern PedPartition* ped_partition_new (const PedDisk* disk, | |
| PedPartitionType type, | | PedPartitionType type, | |
| const PedFileSystemType* fs_type, | | const PedFileSystemType* fs_type, | |
| PedSector start, | | PedSector start, | |
| PedSector end); | | PedSector end); | |
| extern void ped_partition_destroy (PedPartition* part); | | extern void ped_partition_destroy (PedPartition* part); | |
|
| extern int ped_partition_is_active (const PedPartition* part); | | extern int ped_partition_is_active (const PedPartition* part) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_partition_set_flag (PedPartition* part, PedPartitionFlag fla
g, | | extern int ped_partition_set_flag (PedPartition* part, PedPartitionFlag fla
g, | |
| int state); | | int state); | |
| extern int ped_partition_get_flag (const PedPartition* part, | | extern int ped_partition_get_flag (const PedPartition* part, | |
| PedPartitionFlag flag); | | PedPartitionFlag flag); | |
| extern int ped_partition_is_flag_available (const PedPartition* part, | | extern int ped_partition_is_flag_available (const PedPartition* part, | |
| PedPartitionFlag flag); | | PedPartitionFlag flag); | |
| extern int ped_partition_set_system (PedPartition* part, | | extern int ped_partition_set_system (PedPartition* part, | |
| const PedFileSystemType* fs_type); | | const PedFileSystemType* fs_type); | |
| extern int ped_partition_set_name (PedPartition* part, const char* name); | | extern int ped_partition_set_name (PedPartition* part, const char* name); | |
| extern const char* ped_partition_get_name (const PedPartition* part); | | extern const char* ped_partition_get_name (const PedPartition* part); | |
| extern int ped_partition_is_busy (const PedPartition* part); | | extern int ped_partition_is_busy (const PedPartition* part); | |
| extern char* ped_partition_get_path (const PedPartition* part); | | extern char* ped_partition_get_path (const PedPartition* part); | |
| | | | |
|
| extern const char* ped_partition_type_get_name (PedPartitionType part_type) | | extern const char* ped_partition_type_get_name (PedPartitionType part_type) | |
| ; | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| extern const char* ped_partition_flag_get_name (PedPartitionFlag flag); | | extern const char* ped_partition_flag_get_name (PedPartitionFlag flag); | |
| extern PedPartitionFlag ped_partition_flag_get_by_name (const char* name); | | extern PedPartitionFlag ped_partition_flag_get_by_name (const char* name); | |
|
| extern PedPartitionFlag ped_partition_flag_next (PedPartitionFlag flag); | | extern PedPartitionFlag ped_partition_flag_next (PedPartitionFlag flag) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| /** @} */ | | /** @} */ | |
| | | | |
| /** | | /** | |
| * \addtogroup PedDisk | | * \addtogroup PedDisk | |
| * @{ | | * @{ | |
| */ | | */ | |
| | | | |
| extern int ped_disk_add_partition (PedDisk* disk, PedPartition* part, | | extern int ped_disk_add_partition (PedDisk* disk, PedPartition* part, | |
| const PedConstraint* constraint); | | const PedConstraint* constraint); | |
| | | | |
| skipping to change at line 360 | | skipping to change at line 405 | |
| extern int ped_disk_set_partition_geom (PedDisk* disk, PedPartition* part, | | extern int ped_disk_set_partition_geom (PedDisk* disk, PedPartition* part, | |
| const PedConstraint* constraint, | | const PedConstraint* constraint, | |
| PedSector start, PedSector end); | | PedSector start, PedSector end); | |
| extern int ped_disk_maximize_partition (PedDisk* disk, PedPartition* part, | | extern int ped_disk_maximize_partition (PedDisk* disk, PedPartition* part, | |
| const PedConstraint* constraint); | | const PedConstraint* constraint); | |
| extern PedGeometry* ped_disk_get_max_partition_geometry (PedDisk* disk, | | extern PedGeometry* ped_disk_get_max_partition_geometry (PedDisk* disk, | |
| PedPartition* part, const PedConstraint* constraint); | | PedPartition* part, const PedConstraint* constraint); | |
| extern int ped_disk_minimize_extended_partition (PedDisk* disk); | | extern int ped_disk_minimize_extended_partition (PedDisk* disk); | |
| | | | |
| extern PedPartition* ped_disk_next_partition (const PedDisk* disk, | | extern PedPartition* ped_disk_next_partition (const PedDisk* disk, | |
|
| const PedPartition* part); | | const PedPartition* part) | |
| extern PedPartition* ped_disk_get_partition (const PedDisk* disk, int num); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedPartition* ped_disk_get_partition (const PedDisk* disk, int num) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern PedPartition* ped_disk_get_partition_by_sector (const PedDisk* disk, | | extern PedPartition* ped_disk_get_partition_by_sector (const PedDisk* disk, | |
|
| PedSector sect); | | PedSector sect) | |
| extern PedPartition* ped_disk_extended_partition (const PedDisk* disk); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedPartition* ped_disk_extended_partition (const PedDisk* disk) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern PedSector ped_disk_max_partition_length (const PedDisk *disk); | | extern PedSector ped_disk_max_partition_length (const PedDisk *disk); | |
| extern PedSector ped_disk_max_partition_start_sector (const PedDisk *disk); | | extern PedSector ped_disk_max_partition_start_sector (const PedDisk *disk); | |
| | | | |
| /* internal functions */ | | /* internal functions */ | |
| extern PedDisk* _ped_disk_alloc (const PedDevice* dev, const PedDiskType* t
ype); | | extern PedDisk* _ped_disk_alloc (const PedDevice* dev, const PedDiskType* t
ype); | |
| extern void _ped_disk_free (PedDisk* disk); | | extern void _ped_disk_free (PedDisk* disk); | |
| | | | |
| /** @} */ | | /** @} */ | |
| | | | |
| | | | |
End of changes. 12 change blocks. |
| 16 lines changed or deleted | | 80 lines changed or added | |
|
| exception.h | | exception.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1999-2000, 2007, 2009-2011 Free Software Foundation, Inc. | | Copyright (C) 1999-2000, 2007, 2009-2012 Free Software Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 86 | | skipping to change at line 86 | |
| PedExceptionOption options; /**< ORed list of options th
at | | PedExceptionOption options; /**< ORed list of options th
at | |
| the exception handler can | | the exception handler can | |
| return (the ways an excep
tion | | return (the ways an excep
tion | |
| can be resolved) */ | | can be resolved) */ | |
| }; | | }; | |
| | | | |
| typedef PedExceptionOption (PedExceptionHandler) (PedException* ex); | | typedef PedExceptionOption (PedExceptionHandler) (PedException* ex); | |
| | | | |
| extern int ped_exception; /* set to true if there's an exception */ | | extern int ped_exception; /* set to true if there's an exception */ | |
| | | | |
|
| extern char* ped_exception_get_type_string (PedExceptionType ex_type); | | extern char* ped_exception_get_type_string (PedExceptionType ex_type) | |
| extern char* ped_exception_get_option_string (PedExceptionOption ex_opt); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | extern char* ped_exception_get_option_string (PedExceptionOption ex_opt) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern void ped_exception_set_handler (PedExceptionHandler* handler); | | extern void ped_exception_set_handler (PedExceptionHandler* handler); | |
|
| extern PedExceptionHandler *ped_exception_get_handler(void); | | extern PedExceptionHandler *ped_exception_get_handler(void) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern PedExceptionOption ped_exception_default_handler (PedException* ex); | | extern PedExceptionOption ped_exception_default_handler (PedException* ex); | |
| | | | |
| extern PedExceptionOption ped_exception_throw (PedExceptionType ex_typ
e, | | extern PedExceptionOption ped_exception_throw (PedExceptionType ex_typ
e, | |
| PedExceptionOption ex_o
pt, | | PedExceptionOption ex_o
pt, | |
| const char* message, | | const char* message, | |
| ...); | | ...); | |
| /* rethrows an exception - i.e. calls the exception handler, (or returns a | | /* rethrows an exception - i.e. calls the exception handler, (or returns a | |
| code to return to pass up higher) */ | | code to return to pass up higher) */ | |
| extern PedExceptionOption ped_exception_rethrow (); | | extern PedExceptionOption ped_exception_rethrow (); | |
| | | | |
End of changes. 3 change blocks. |
| 4 lines changed or deleted | | 19 lines changed or added | |
|
| filesys.h | | filesys.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1999-2001, 2006-2007, 2009-2011 Free Software Foundation, | | Copyright (C) 1999-2001, 2006-2007, 2009-2012 Free Software Foundation, | |
| Inc. | | Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| | | | |
| skipping to change at line 88 | | skipping to change at line 88 | |
| extern void ped_file_system_type_register (PedFileSystemType* type); | | extern void ped_file_system_type_register (PedFileSystemType* type); | |
| extern void ped_file_system_type_unregister (PedFileSystemType* type); | | extern void ped_file_system_type_unregister (PedFileSystemType* type); | |
| | | | |
| extern void ped_file_system_alias_register (PedFileSystemType* type, | | extern void ped_file_system_alias_register (PedFileSystemType* type, | |
| const char* alias, int deprecate
d); | | const char* alias, int deprecate
d); | |
| extern void ped_file_system_alias_unregister (PedFileSystemType* type, | | extern void ped_file_system_alias_unregister (PedFileSystemType* type, | |
| const char* alias); | | const char* alias); | |
| | | | |
| extern PedFileSystemType* ped_file_system_type_get (const char* name); | | extern PedFileSystemType* ped_file_system_type_get (const char* name); | |
| extern PedFileSystemType* | | extern PedFileSystemType* | |
|
| ped_file_system_type_get_next (const PedFileSystemType* fs_type); | | ped_file_system_type_get_next (const PedFileSystemType* fs_type) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern PedFileSystemAlias* | | extern PedFileSystemAlias* | |
|
| ped_file_system_alias_get_next (const PedFileSystemAlias* fs_alias); | | ped_file_system_alias_get_next (const PedFileSystemAlias* fs_alias) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern PedFileSystemType* ped_file_system_probe (PedGeometry* geom); | | extern PedFileSystemType* ped_file_system_probe (PedGeometry* geom); | |
| extern PedGeometry* ped_file_system_probe_specific ( | | extern PedGeometry* ped_file_system_probe_specific ( | |
| const PedFileSystemType* fs_type, | | const PedFileSystemType* fs_type, | |
| PedGeometry* geom); | | PedGeometry* geom); | |
| | | | |
|
| | | PedFileSystem *ped_file_system_open (PedGeometry *geom); | |
| | | int ped_file_system_close (PedFileSystem *fs); | |
| | | int ped_file_system_resize (PedFileSystem *fs, PedGeometry *geom, | |
| | | PedTimer *timer); | |
| | | PedConstraint *ped_file_system_get_resize_constraint (const PedFileSystem * | |
| | | fs); | |
| | | | |
| #endif /* PED_FILESYS_H_INCLUDED */ | | #endif /* PED_FILESYS_H_INCLUDED */ | |
| | | | |
| /** @} */ | | /** @} */ | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 20 lines changed or added | |
|
| geom.h | | geom.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1998-2001, 2005, 2007, 2009-2011 Free Software Foundation
, | | Copyright (C) 1998-2001, 2005, 2007, 2009-2012 Free Software Foundation
, | |
| Inc. | | Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 58 | |
| PedSector length); | | PedSector length); | |
| extern PedGeometry* ped_geometry_duplicate (const PedGeometry* geom); | | extern PedGeometry* ped_geometry_duplicate (const PedGeometry* geom); | |
| extern PedGeometry* ped_geometry_intersect (const PedGeometry* a, | | extern PedGeometry* ped_geometry_intersect (const PedGeometry* a, | |
| const PedGeometry* b); | | const PedGeometry* b); | |
| extern void ped_geometry_destroy (PedGeometry* geom); | | extern void ped_geometry_destroy (PedGeometry* geom); | |
| extern int ped_geometry_set (PedGeometry* geom, PedSector start, | | extern int ped_geometry_set (PedGeometry* geom, PedSector start, | |
| PedSector length); | | PedSector length); | |
| extern int ped_geometry_set_start (PedGeometry* geom, PedSector start); | | extern int ped_geometry_set_start (PedGeometry* geom, PedSector start); | |
| extern int ped_geometry_set_end (PedGeometry* geom, PedSector end); | | extern int ped_geometry_set_end (PedGeometry* geom, PedSector end); | |
| extern int ped_geometry_test_overlap (const PedGeometry* a, | | extern int ped_geometry_test_overlap (const PedGeometry* a, | |
|
| const PedGeometry* b); | | const PedGeometry* b) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_geometry_test_inside (const PedGeometry* a, | | extern int ped_geometry_test_inside (const PedGeometry* a, | |
|
| const PedGeometry* b); | | const PedGeometry* b) | |
| extern int ped_geometry_test_equal (const PedGeometry* a, const PedGeometry | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| * b); | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | extern int ped_geometry_test_equal (const PedGeometry* a, const PedGeometry | |
| | | * b) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern int ped_geometry_test_sector_inside (const PedGeometry* geom, | | extern int ped_geometry_test_sector_inside (const PedGeometry* geom, | |
|
| PedSector sect); | | PedSector sect) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern int ped_geometry_read (const PedGeometry* geom, void* buffer, | | extern int ped_geometry_read (const PedGeometry* geom, void* buffer, | |
| PedSector offset, PedSector count); | | PedSector offset, PedSector count); | |
| extern int ped_geometry_read_alloc (const PedGeometry* geom, void** buffer, | | extern int ped_geometry_read_alloc (const PedGeometry* geom, void** buffer, | |
| PedSector offset, PedSector count); | | PedSector offset, PedSector count); | |
| extern int ped_geometry_write (PedGeometry* geom, const void* buffer, | | extern int ped_geometry_write (PedGeometry* geom, const void* buffer, | |
| PedSector offset, PedSector count); | | PedSector offset, PedSector count); | |
| extern PedSector ped_geometry_check (PedGeometry* geom, void* buffer, | | extern PedSector ped_geometry_check (PedGeometry* geom, void* buffer, | |
| PedSector buffer_size, PedSector offset
, | | PedSector buffer_size, PedSector offset
, | |
| PedSector granularity, PedSector count, | | PedSector granularity, PedSector count, | |
| PedTimer* timer); | | PedTimer* timer); | |
| extern int ped_geometry_sync (PedGeometry* geom); | | extern int ped_geometry_sync (PedGeometry* geom); | |
| extern int ped_geometry_sync_fast (PedGeometry* geom); | | extern int ped_geometry_sync_fast (PedGeometry* geom); | |
| | | | |
| /* returns -1 if "sector" is not within dest's space. */ | | /* returns -1 if "sector" is not within dest's space. */ | |
| extern PedSector ped_geometry_map (const PedGeometry* dst, | | extern PedSector ped_geometry_map (const PedGeometry* dst, | |
| const PedGeometry* src, | | const PedGeometry* src, | |
|
| PedSector sector); | | PedSector sector) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| #endif /* PED_GEOM_H_INCLUDED */ | | #endif /* PED_GEOM_H_INCLUDED */ | |
| | | | |
| /** @} */ | | /** @} */ | |
| | | | |
End of changes. 5 change blocks. |
| 7 lines changed or deleted | | 28 lines changed or added | |
|
| natmath.h | | natmath.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 2000, 2007-2011 Free Software Foundation, Inc. | | Copyright (C) 2000, 2007-2012 Free Software Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 60 | | skipping to change at line 60 | |
| * | | * | |
| * For the align_* operations, there must be a solution. i.e. align != NUL
L | | * For the align_* operations, there must be a solution. i.e. align != NUL
L | |
| * All solutions must be greater than zero. | | * All solutions must be greater than zero. | |
| */ | | */ | |
| | | | |
| struct _PedAlignment { | | struct _PedAlignment { | |
| PedSector offset; | | PedSector offset; | |
| PedSector grain_size; | | PedSector grain_size; | |
| }; | | }; | |
| | | | |
|
| extern PedSector ped_round_up_to (PedSector sector, PedSector grain_size); | | extern PedSector ped_round_up_to (PedSector sector, PedSector grain_size) | |
| extern PedSector ped_round_down_to (PedSector sector, PedSector grain_size) | | | |
| ; | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| extern PedSector ped_round_to_nearest (PedSector sector, PedSector grain_si | | __attribute ((__const__)) | |
| ze); | | #endif | |
| extern PedSector ped_greatest_common_divisor (PedSector a, PedSector b); | | ; | |
| | | extern PedSector ped_round_down_to (PedSector sector, PedSector grain_size) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedSector ped_round_to_nearest (PedSector sector, PedSector grain_si | |
| | | ze) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedSector ped_greatest_common_divisor (PedSector a, PedSector b) | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern int ped_alignment_init (PedAlignment* align, PedSector offset, | | extern int ped_alignment_init (PedAlignment* align, PedSector offset, | |
| PedSector grain_size); | | PedSector grain_size); | |
| extern PedAlignment* ped_alignment_new (PedSector offset, PedSector grain_s
ize); | | extern PedAlignment* ped_alignment_new (PedSector offset, PedSector grain_s
ize); | |
| extern void ped_alignment_destroy (PedAlignment* align); | | extern void ped_alignment_destroy (PedAlignment* align); | |
| extern PedAlignment* ped_alignment_duplicate (const PedAlignment* align); | | extern PedAlignment* ped_alignment_duplicate (const PedAlignment* align); | |
| extern PedAlignment* ped_alignment_intersect (const PedAlignment* a, | | extern PedAlignment* ped_alignment_intersect (const PedAlignment* a, | |
| const PedAlignment* b); | | const PedAlignment* b); | |
| | | | |
| extern PedSector | | extern PedSector | |
| ped_alignment_align_up (const PedAlignment* align, const PedGeometry* geom, | | ped_alignment_align_up (const PedAlignment* align, const PedGeometry* geom, | |
|
| PedSector sector); | | PedSector sector) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern PedSector | | extern PedSector | |
| ped_alignment_align_down (const PedAlignment* align, const PedGeometry* geo
m, | | ped_alignment_align_down (const PedAlignment* align, const PedGeometry* geo
m, | |
|
| PedSector sector); | | PedSector sector) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| extern PedSector | | extern PedSector | |
| ped_alignment_align_nearest (const PedAlignment* align, const PedGeometry*
geom, | | ped_alignment_align_nearest (const PedAlignment* align, const PedGeometry*
geom, | |
|
| PedSector sector); | | PedSector sector) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern int | | extern int | |
| ped_alignment_is_aligned (const PedAlignment* align, const PedGeometry* geo
m, | | ped_alignment_is_aligned (const PedAlignment* align, const PedGeometry* geo
m, | |
|
| PedSector sector); | | PedSector sector) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern const PedAlignment* ped_alignment_any; | | extern const PedAlignment* ped_alignment_any; | |
| extern const PedAlignment* ped_alignment_none; | | extern const PedAlignment* ped_alignment_none; | |
| | | | |
| static inline PedSector | | static inline PedSector | |
| ped_div_round_up (PedSector numerator, PedSector divisor) | | ped_div_round_up (PedSector numerator, PedSector divisor) | |
| { | | { | |
| return (numerator + divisor - 1) / divisor; | | return (numerator + divisor - 1) / divisor; | |
| } | | } | |
| | | | |
| | | | |
End of changes. 6 change blocks. |
| 11 lines changed or deleted | | 46 lines changed or added | |
|
| parted.h | | parted.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 1999-2001, 2007, 2009-2011 Free Software Foundation, Inc. | | Copyright (C) 1999-2001, 2007, 2009-2012 Free Software Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| | | | |
| #ifndef PARTED_H_INCLUDED | | #ifndef PARTED_H_INCLUDED | |
| #define PARTED_H_INCLUDED | | #define PARTED_H_INCLUDED | |
| | | | |
| #define PED_DEFAULT_ALIGNMENT (1024 * 1024) | | #define PED_DEFAULT_ALIGNMENT (1024 * 1024) | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
|
| | | #if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | |
| | | # define __attribute(arg) __attribute__ (arg) | |
| | | #else | |
| | | # define __attribute(arg) | |
| | | #endif | |
| | | | |
| #include <parted/constraint.h> | | #include <parted/constraint.h> | |
| #include <parted/device.h> | | #include <parted/device.h> | |
| #include <parted/disk.h> | | #include <parted/disk.h> | |
| #include <parted/exception.h> | | #include <parted/exception.h> | |
| #include <parted/filesys.h> | | #include <parted/filesys.h> | |
| #include <parted/natmath.h> | | #include <parted/natmath.h> | |
| #include <parted/unit.h> | | #include <parted/unit.h> | |
| | | | |
| #include <stdint.h> | | #include <stdint.h> | |
| #include <stdlib.h> | | #include <stdlib.h> | |
| #include <string.h> | | #include <string.h> | |
| | | | |
|
| extern const char* ped_get_version (); | | extern const char *ped_get_version () | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern void* ped_malloc (size_t size); | | extern void* ped_malloc (size_t size); | |
| extern void* ped_calloc (size_t size); | | extern void* ped_calloc (size_t size); | |
|
| extern int ped_realloc (void** ptr, size_t size); | | | |
| extern void free (void* ptr); | | extern void free (void* ptr); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif /* PARTED_H_INCLUDED */ | | #endif /* PARTED_H_INCLUDED */ | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 12 lines changed or added | |
|
| unit.h | | unit.h | |
| /* | | /* | |
| libparted - a library for manipulating disk partitions | | libparted - a library for manipulating disk partitions | |
|
| Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc. | | Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc. | |
| | | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU General Public License as published by | | it under the terms of the GNU General Public License as published by | |
| the Free Software Foundation; either version 3 of the License, or | | the Free Software Foundation; either version 3 of the License, or | |
| (at your option) any later version. | | (at your option) any later version. | |
| | | | |
| This program is distributed in the hope that it will be useful, | | This program is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| GNU General Public License for more details. | | GNU General Public License for more details. | |
| | | | |
| skipping to change at line 68 | | skipping to change at line 68 | |
| PED_UNIT_KIBIBYTE, | | PED_UNIT_KIBIBYTE, | |
| PED_UNIT_MEBIBYTE, | | PED_UNIT_MEBIBYTE, | |
| PED_UNIT_GIBIBYTE, | | PED_UNIT_GIBIBYTE, | |
| PED_UNIT_TEBIBYTE | | PED_UNIT_TEBIBYTE | |
| } PedUnit; | | } PedUnit; | |
| | | | |
| #define PED_UNIT_FIRST PED_UNIT_SECTOR | | #define PED_UNIT_FIRST PED_UNIT_SECTOR | |
| #define PED_UNIT_LAST PED_UNIT_TEBIBYTE | | #define PED_UNIT_LAST PED_UNIT_TEBIBYTE | |
| | | | |
| extern long long ped_unit_get_size (const PedDevice* dev, PedUnit unit); | | extern long long ped_unit_get_size (const PedDevice* dev, PedUnit unit); | |
|
| extern const char* ped_unit_get_name (PedUnit unit); | | extern const char *ped_unit_get_name (PedUnit unit) | |
| extern PedUnit ped_unit_get_by_name (const char* unit_name); | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__const__)) | |
| | | #endif | |
| | | ; | |
| | | extern PedUnit ped_unit_get_by_name (const char* unit_name) | |
| | | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
| | | __attribute ((__pure__)) | |
| | | #endif | |
| | | ; | |
| | | | |
| extern void ped_unit_set_default (PedUnit unit); | | extern void ped_unit_set_default (PedUnit unit); | |
| extern PedUnit ped_unit_get_default (); | | extern PedUnit ped_unit_get_default (); | |
| | | | |
| extern char* ped_unit_format_byte (const PedDevice* dev, PedSector byte); | | extern char* ped_unit_format_byte (const PedDevice* dev, PedSector byte); | |
| extern char* ped_unit_format_custom_byte (const PedDevice* dev, PedSector b
yte, | | extern char* ped_unit_format_custom_byte (const PedDevice* dev, PedSector b
yte, | |
| PedUnit unit); | | PedUnit unit); | |
| | | | |
| extern char* ped_unit_format (const PedDevice* dev, PedSector sector); | | extern char* ped_unit_format (const PedDevice* dev, PedSector sector); | |
| extern char* ped_unit_format_custom (const PedDevice* dev, PedSector sector
, | | extern char* ped_unit_format_custom (const PedDevice* dev, PedSector sector
, | |
| | | | |
End of changes. 2 change blocks. |
| 3 lines changed or deleted | | 16 lines changed or added | |
|