debug.h   debug.h 
skipping to change at line 42 skipping to change at line 42
const char* function, const char* msg, ... ); const char* function, const char* msg, ... );
extern void __attribute__((__noreturn__)) extern void __attribute__((__noreturn__))
ped_assert ( const char* cond_text, ped_assert ( const char* cond_text,
const char* file, int line, const char* function ) ; const char* file, int line, const char* function ) ;
#if defined __GNUC__ && !defined __JSFTRACE__ #if defined __GNUC__ && !defined __JSFTRACE__
#define PED_DEBUG(level, ...) \ #define PED_DEBUG(level, ...) \
ped_debug ( level, __FILE__, __LINE__, __PRETTY_FUNCTION__, \ ped_debug ( level, __FILE__, __LINE__, __PRETTY_FUNCTION__, \
__VA_ARGS__ ); __VA_ARGS__ )
#define PED_ASSERT(cond, action) \ #define PED_ASSERT(cond, action) \
do { \ do { \
if (!(cond)) { \ if (!(cond)) { \
ped_assert ( \ ped_assert ( \
#cond, \ #cond, \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
__PRETTY_FUNCTION__ ); \ __PRETTY_FUNCTION__ ); \
} \ } \
skipping to change at line 82 skipping to change at line 82
"unknown", \ "unknown", \
0, \ 0, \
"unknown"); \ "unknown"); \
} \ } \
} while (0) } while (0)
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#else /* !DEBUG */ #else /* !DEBUG */
#define PED_ASSERT(cond, action) while (0) {} #define PED_ASSERT(cond, action) do {} while (0)
#define PED_DEBUG(level, ...) while (0) {} #define PED_DEBUG(level, ...) do {} while (0)
#endif /* DEBUG */ #endif /* DEBUG */
#endif /* PED_DEBUG_H_INCLUDED */ #endif /* PED_DEBUG_H_INCLUDED */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 device.h   device.h 
skipping to change at line 49 skipping to change at line 49
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_MD = 17
} 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 147 skipping to change at line 149
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,
PedSector start, PedSector count); PedSector start, PedSector count);
extern int ped_device_write (PedDevice* dev, const void* buffer, extern int ped_device_write (PedDevice* dev, const void* buffer,
PedSector start, PedSector count); PedSector start, PedSector count);
extern int ped_device_sync (PedDevice* dev); extern int ped_device_sync (PedDevice* dev);
extern int ped_device_sync_fast (PedDevice* dev); extern int ped_device_sync_fast (PedDevice* dev);
extern PedSector ped_device_check (PedDevice* dev, void* buffer, extern PedSector ped_device_check (PedDevice* dev, void* buffer,
PedSector start, PedSector count); PedSector start, PedSector count);
extern PedConstraint* ped_device_get_constraint (PedDevice* dev); extern PedConstraint* ped_device_get_constraint (const PedDevice* dev);
extern PedConstraint *ped_device_get_minimal_aligned_constraint( extern PedConstraint *ped_device_get_minimal_aligned_constraint(
const PedDevice *d ev); const PedDevice *d ev);
extern PedConstraint *ped_device_get_optimal_aligned_constraint( extern PedConstraint *ped_device_get_optimal_aligned_constraint(
const PedDevice *d ev); const PedDevice *d ev);
extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev) ; extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev) ;
extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev) ; extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev) ;
/* private stuff ;-) */ /* private stuff ;-) */
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added


 disk.h   disk.h 
skipping to change at line 71 skipping to change at line 71
PED_PARTITION_SWAP=3, PED_PARTITION_SWAP=3,
PED_PARTITION_HIDDEN=4, PED_PARTITION_HIDDEN=4,
PED_PARTITION_RAID=5, PED_PARTITION_RAID=5,
PED_PARTITION_LVM=6, PED_PARTITION_LVM=6,
PED_PARTITION_LBA=7, PED_PARTITION_LBA=7,
PED_PARTITION_HPSERVICE=8, PED_PARTITION_HPSERVICE=8,
PED_PARTITION_PALO=9, PED_PARTITION_PALO=9,
PED_PARTITION_PREP=10, PED_PARTITION_PREP=10,
PED_PARTITION_MSFT_RESERVED=11, PED_PARTITION_MSFT_RESERVED=11,
PED_PARTITION_BIOS_GRUB=12, PED_PARTITION_BIOS_GRUB=12,
PED_PARTITION_APPLE_TV_RECOVERY=13 PED_PARTITION_APPLE_TV_RECOVERY=13,
PED_PARTITION_DIAG=14
}; };
#define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT #define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT
#define PED_PARTITION_LAST_FLAG PED_PARTITION_APPLE_TV_RECOVERY #define PED_PARTITION_LAST_FLAG PED_PARTITION_DIAG
enum _PedDiskTypeFeature { enum _PedDiskTypeFeature {
PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions * / PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions * /
PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */ PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */
}; };
#define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED #define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED
#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME #define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME
struct _PedDisk; struct _PedDisk;
struct _PedPartition; struct _PedPartition;
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 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/