device.h   device.h 
skipping to change at line 45 skipping to change at line 45
/** \deprecated Removal from API planned */ /** \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_VIODASD = 10,
PED_DEVICE_SX8 = 11
#ifdef ENABLE_DEVICE_MAPPER
,
PED_DEVICE_DM = 12
#endif
} 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 8 lines changed or added


 disk.h   disk.h 
skipping to change at line 49 skipping to change at line 49
#include <parted/geom.h> #include <parted/geom.h>
/** /**
* Partition types * Partition types
*/ */
typedef enum { typedef enum {
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,
PED_PARTITION_PROTECTED = 0x10
} PedPartitionType; } PedPartitionType;
/** /**
* Partition flags. * Partition flags.
*/ */
typedef enum { typedef enum {
PED_PARTITION_BOOT=1, PED_PARTITION_BOOT=1,
PED_PARTITION_ROOT=2, PED_PARTITION_ROOT=2,
PED_PARTITION_SWAP=3, PED_PARTITION_SWAP=3,
PED_PARTITION_HIDDEN=4, PED_PARTITION_HIDDEN=4,
skipping to change at line 95 skipping to change at line 96
/** \file disk.h */ /** \file disk.h */
/** /**
* PedPartition structure represents a partition. * PedPartition structure represents a partition.
*/ */
struct _PedPartition { struct _PedPartition {
PedPartition* prev; PedPartition* prev;
PedPartition* next; PedPartition* next;
PedDisk* disk; /**< the partition table of the part /**< the partition table of the partition */
ition */ PedDisk* disk;
PedGeometry geom; /**< geometry of the partition */ PedGeometry geom; /**< geometry of the partition */
int num; /**< the partition number: In Linux
, this is the /**< the partition number: In Linux, this is the
same as the minor number. No same as the minor number. No assumption
assumption should be made about "num" and "type"
should be made about "num" a - different disk labels have different rules. */
nd "type"
- different disk labels have int num;
different rules. */
PedPartitionType type; /**< the type of partition: a bit fi eld of PedPartitionType type; /**< the type of partition: a bit fi eld of
PED_PARTITION_LOGICAL, PED_P ARTITION_EXTENDED, PED_PARTITION_LOGICAL, PED_P ARTITION_EXTENDED,
PED_PARTITION_METADATA PED_PARTITION_METADATA
and PED_PARTITION_FREESPACE. and PED_PARTITION_FREESPACE.
Both the first two, and the last two are Both the first two, and the last two are
mutually exclusive. mutually exclusive.
An extended partitio n is a primary An extended partitio n is a primary
partition that may contain l ogical partitions. partition that may contain l ogical partitions.
There is at most one extende d partition on There is at most one extende d partition on
a disk. a disk.
A logical partition is like a primary A logical partition is like a primary
partition, except it's insid e an extended partition, except it's insid e an extended
partition. Internally, pseud o partitions are partition. Internally, pseud o partitions are
allocated to represent free space, or disk allocated to represent free space, or disk
label meta-data. These have the label meta-data. These have the
PED_PARTITION_FREESPACE or PED_PARTITION_FREESPACE or
PED_PARTITION_METADATA bit s et. */ PED_PARTITION_METADATA bit s et. */
const PedFileSystemType* fs_type; /**< The type of file system
on the partition. /**< The type of file system on the partition. NULL if unknown. */
NULL if unknown. */ const PedFileSystemType* fs_type;
PedPartition* part_list; /**< Only used for an exten
ded partition. /**< Only used for an extended partition. The list of logical
The list of logical partitions (and free space and metadata within the extended
partitions partition). */
(and free space and PedPartition* part_list;
metadata within
the extended partiti
on). */
void* disk_specific; void* disk_specific;
}; };
/** @} */ /** @} */
/** /**
* \addtogroup PedDisk * \addtogroup PedDisk
* @{ * @{
*/ */
 End of changes. 4 change blocks. 
22 lines changed or deleted 19 lines changed or added


 exception.h   exception.h 
skipping to change at line 91 skipping to change at line 91
}; };
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); extern char* ped_exception_get_option_string (PedExceptionOption ex_opt);
extern void ped_exception_set_handler (PedExceptionHandler* handler); extern void ped_exception_set_handler (PedExceptionHandler* handler);
extern PedExceptionHandler *ped_exception_get_handler(void);
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. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 linux.h   linux.h 
skipping to change at line 32 skipping to change at line 32
#include <parted/parted.h> #include <parted/parted.h>
#include <parted/device.h> #include <parted/device.h>
#define LINUX_SPECIFIC(dev) ((LinuxSpecific*) (dev)->arch_specific) #define LINUX_SPECIFIC(dev) ((LinuxSpecific*) (dev)->arch_specific)
typedef struct _LinuxSpecific LinuxSpecific; typedef struct _LinuxSpecific LinuxSpecific;
struct _LinuxSpecific { struct _LinuxSpecific {
int fd; int fd;
#if defined(__s390__) || defined(__s390x__)
unsigned int real_sector_size;
/* IBM internal dasd structure (i guess ;), required. */
struct fdasd_anchor *anchor;
#endif
}; };
extern PedArchitecture ped_linux_arch; extern PedArchitecture ped_linux_arch;
#endif /* PED_LINUX_H_INCLUDED */ #endif /* PED_LINUX_H_INCLUDED */
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/