diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2004-06-26 01:18:21 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:36:21 -0700 |
| commit | b99f344fde90ddc131ea6e2ec8520e018e1274e2 (patch) | |
| tree | f4ee01a3a1e3bfa73c66b579b3d0b43702fa32e2 /extras/volume_id/volume_id.h | |
| parent | 062db23d5eb303ef49d2ff805381229932f44246 (diff) | |
[PATCH] update udev_volume_id
volume_id is now able to read NTFS labels. Not very exciting, but we
keep up to date with the version in HAL. Also __packed__ was needed for
the structs, cause the gcc 3.4 compiled version was no longer working
properly.
Diffstat (limited to 'extras/volume_id/volume_id.h')
| -rw-r--r-- | extras/volume_id/volume_id.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extras/volume_id/volume_id.h b/extras/volume_id/volume_id.h index 2f20244c7c..a939743dc1 100644 --- a/extras/volume_id/volume_id.h +++ b/extras/volume_id/volume_id.h @@ -21,9 +21,9 @@ #ifndef _VOLUME_ID_H_ #define _VOLUME_ID_H_ -#define VOLUME_ID_VERSION 002 +#define VOLUME_ID_VERSION 004 -#define VOLUME_ID_LABEL_SIZE 32 +#define VOLUME_ID_LABEL_SIZE 64 #define VOLUME_ID_UUID_SIZE 16 #define VOLUME_ID_UUID_STRING_SIZE 37 #define VOLUME_ID_PATH_MAX 255 @@ -45,19 +45,19 @@ enum filesystem_type { }; struct volume_id { - char label_raw[VOLUME_ID_LABEL_SIZE]; - size_t label_raw_len; + unsigned char label_raw[VOLUME_ID_LABEL_SIZE]; + unsigned int label_raw_len; char label_string[VOLUME_ID_LABEL_SIZE+1]; unsigned char uuid[VOLUME_ID_UUID_SIZE]; char uuid_string[VOLUME_ID_UUID_STRING_SIZE]; enum filesystem_type fs_type; char *fs_name; int fd; - char *sbbuf; - size_t sbbuf_len; - char *seekbuf; - size_t seekbuf_off; - size_t seekbuf_len; + unsigned char *sbbuf; + unsigned int sbbuf_len; + unsigned char *seekbuf; + unsigned int seekbuf_off; + unsigned int seekbuf_len; int fd_close; }; |