Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi-busybox/util-linux/volume_id/volume_id_internal.h

    r2725 r3232  
    8181//  smallint    usage_id;
    8282//  const char  *usage;
    83 //  const char  *type;
     83#if ENABLE_FEATURE_BLKID_TYPE
     84    const char  *type;
     85#endif
    8486};
    8587
     
    135137#endif
    136138
     139/* volume_id_set_uuid(id,buf,fmt) assumes size of uuid buf
     140 * by shifting: 4 << fmt, except for fmt == UUID_DCE_STRING.
     141 * The constants below should match sizes.
     142 */
    137143enum uuid_format {
    138     UUID_DCE_STRING,
    139     UUID_DCE,
    140     UUID_DOS,
    141     UUID_NTFS,
    142     UUID_HFS,
     144    UUID_DOS = 0,       /* 4 bytes */
     145    UUID_NTFS = 1,      /* 8 bytes */
     146    UUID_DCE = 2,       /* 16 bytes */
     147    UUID_DCE_STRING = 3,    /* 36 bytes (VOLUME_ID_UUID_SIZE) */
    143148};
    144149
     
    211216//int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
    212217
     218int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/);
     219
    213220int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/);
    214221
     222int FAST_FUNC volume_id_probe_exfat(struct volume_id *id /*,uint64_t off*/);
     223
    215224int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/);
    216225
     
    219228int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
    220229
     230int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id /*,uint64_t off*/);
     231
    221232int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);
    222233
Note: See TracChangeset for help on using the changeset viewer.