Merge branch 'dankamongmen/libblkid-manual-fix' of https://github.com/dankamongmen/util-linux
This commit is contained in:
commit
77d44c1e51
|
@ -46,7 +46,7 @@
|
||||||
*
|
*
|
||||||
* @PART_ENTRY_UUID: partition UUID (gpt, or pseudo IDs for MBR)
|
* @PART_ENTRY_UUID: partition UUID (gpt, or pseudo IDs for MBR)
|
||||||
*
|
*
|
||||||
* @PART_ENTRY_TYPE: partition type, 0xNN (e.g 0x82) or type UUID (gpt only) or type string (mac)
|
* @PART_ENTRY_TYPE: partition type, 0xNN (e.g. 0x82) or type UUID (gpt only) or type string (mac)
|
||||||
*
|
*
|
||||||
* @PART_ENTRY_FLAGS: partition flags (e.g. boot_ind) or attributes (e.g. gpt attributes)
|
* @PART_ENTRY_FLAGS: partition flags (e.g. boot_ind) or attributes (e.g. gpt attributes)
|
||||||
*
|
*
|
||||||
|
@ -184,7 +184,7 @@ struct blkid_struct_partition {
|
||||||
unsigned long long flags; /* partition flags / attributes */
|
unsigned long long flags; /* partition flags / attributes */
|
||||||
|
|
||||||
int partno; /* partition number */
|
int partno; /* partition number */
|
||||||
char uuid[UUID_STR_LEN]; /* UUID (when supported by PT), e.g GPT */
|
char uuid[UUID_STR_LEN]; /* UUID (when supported by PT), e.g. GPT */
|
||||||
unsigned char name[128]; /* Partition in UTF8 name (when supported by PT), e.g. Mac */
|
unsigned char name[128]; /* Partition in UTF8 name (when supported by PT), e.g. Mac */
|
||||||
|
|
||||||
blkid_parttable tab; /* partition table */
|
blkid_parttable tab; /* partition table */
|
||||||
|
@ -923,7 +923,7 @@ int blkid_partlist_numof_partitions(blkid_partlist ls)
|
||||||
* blkid_partlist_get_table:
|
* blkid_partlist_get_table:
|
||||||
* @ls: partitions list
|
* @ls: partitions list
|
||||||
*
|
*
|
||||||
* Returns: top-level partition table or NULL of there is not a partition table
|
* Returns: top-level partition table or NULL if there is not a partition table
|
||||||
* on the device.
|
* on the device.
|
||||||
*/
|
*/
|
||||||
blkid_parttable blkid_partlist_get_table(blkid_partlist ls)
|
blkid_parttable blkid_partlist_get_table(blkid_partlist ls)
|
||||||
|
@ -1408,7 +1408,7 @@ const char *blkid_partition_get_uuid(blkid_partition par)
|
||||||
* @par: partition
|
* @par: partition
|
||||||
*
|
*
|
||||||
* Returns: proposed partition number (e.g. 'N' from sda'N') or -1 in case of
|
* Returns: proposed partition number (e.g. 'N' from sda'N') or -1 in case of
|
||||||
* error. Note that the number is generate by library independently on your OS.
|
* error. Note that the number is generated by library independently of your OS.
|
||||||
*/
|
*/
|
||||||
int blkid_partition_get_partno(blkid_partition par)
|
int blkid_partition_get_partno(blkid_partition par)
|
||||||
{
|
{
|
||||||
|
@ -1443,9 +1443,9 @@ blkid_loff_t blkid_partition_get_start(blkid_partition par)
|
||||||
* @par: partition
|
* @par: partition
|
||||||
*
|
*
|
||||||
* WARNING: be very careful when you work with MS-DOS extended partitions. The
|
* WARNING: be very careful when you work with MS-DOS extended partitions. The
|
||||||
* library always returns full size of the partition. If you want add
|
* library always returns full size of the partition. If you want to
|
||||||
* the partition to the Linux system (BLKPG_ADD_PARTITION ioctl) you
|
* add the partition to the Linux system (BLKPG_ADD_PARTITION ioctl)
|
||||||
* need to reduce the size of the partition to 1 or 2 blocks. The
|
* you need to reduce the size of the partition to 1 or 2 blocks. The
|
||||||
* rest of the partition has to be inaccessible for mkfs or mkswap
|
* rest of the partition has to be inaccessible for mkfs or mkswap
|
||||||
* programs, we need a small space for boot loaders only.
|
* programs, we need a small space for boot loaders only.
|
||||||
*
|
*
|
||||||
|
@ -1481,7 +1481,7 @@ int blkid_partition_set_type_string(blkid_partition par,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sets partition 'type' for PT where the type is defined by UUIDrather
|
/* Sets partition 'type' for PT where the type is defined by UUID rather
|
||||||
* than by number
|
* than by number
|
||||||
*/
|
*/
|
||||||
int blkid_partition_set_type_uuid(blkid_partition par, const unsigned char *uuid)
|
int blkid_partition_set_type_uuid(blkid_partition par, const unsigned char *uuid)
|
||||||
|
@ -1494,7 +1494,7 @@ int blkid_partition_set_type_uuid(blkid_partition par, const unsigned char *uuid
|
||||||
* blkid_partition_get_type_string:
|
* blkid_partition_get_type_string:
|
||||||
* @par: partition
|
* @par: partition
|
||||||
*
|
*
|
||||||
* The type string is supported by a small subset of partition tables (e.g Mac
|
* The type string is supported by a small subset of partition tables (e.g. Mac
|
||||||
* and EFI GPT). Note that GPT uses type UUID and this function returns this
|
* and EFI GPT). Note that GPT uses type UUID and this function returns this
|
||||||
* UUID as string.
|
* UUID as string.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue