summaryrefslogtreecommitdiff
path: root/util-linux/volume_id/volume_id_internal.h
diff options
context:
space:
mode:
authorDenis Vlasenko2008-11-30 17:41:31 +0000
committerDenis Vlasenko2008-11-30 17:41:31 +0000
commit1e10afcdfb2b3725458d7a245aa0fe2d39f6d812 (patch)
treeed4736d6448b409c0f18b6ea9f94ea4bc4b59da7 /util-linux/volume_id/volume_id_internal.h
parenta34b8a4d305544aaeb6fa3b3576f4fd8a582b082 (diff)
downloadbusybox-1e10afcdfb2b3725458d7a245aa0fe2d39f6d812.zip
busybox-1e10afcdfb2b3725458d7a245aa0fe2d39f6d812.tar.gz
volume_id/fat: careful with sector#, it may not fit in 32 bits. +91 bytes
volume_id/*: a bit of code shrink
Diffstat (limited to 'util-linux/volume_id/volume_id_internal.h')
-rw-r--r--util-linux/volume_id/volume_id_internal.h24
1 files changed, 11 insertions, 13 deletions
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 075ddb3..fe3547d 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -61,6 +61,17 @@ struct volume_id_partition {
#endif
struct volume_id {
+ int fd;
+// int fd_close:1;
+ size_t sbbuf_len;
+ size_t seekbuf_len;
+ uint8_t *sbbuf;
+ uint8_t *seekbuf;
+ uint64_t seekbuf_off;
+#ifdef UNUSED_PARTITION_CODE
+ struct volume_id_partition *partitions;
+ size_t partition_count;
+#endif
// uint8_t label_raw[VOLUME_ID_LABEL_SIZE];
// size_t label_raw_len;
char label[VOLUME_ID_LABEL_SIZE+1];
@@ -72,19 +83,6 @@ struct volume_id {
// smallint usage_id;
// const char *usage;
// const char *type;
-
-#ifdef UNUSED_PARTITION_CODE
- struct volume_id_partition *partitions;
- size_t partition_count;
-#endif
-
- int fd;
- uint8_t *sbbuf;
- uint8_t *seekbuf;
- size_t sbbuf_len;
- uint64_t seekbuf_off;
- size_t seekbuf_len;
-// int fd_close:1;
};
struct volume_id *volume_id_open_node(int fd);