chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove no longer needed includes
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
volume_id.h
diff --git
a/extras/volume_id/volume_id/volume_id.h
b/extras/volume_id/volume_id/volume_id.h
index 63f95132dfbad46c36c3201eabcfeb4e30fc6b55..6537f7c67e4ef6bee553d3bda4db8661ce7dd6d0 100644
(file)
--- a/
extras/volume_id/volume_id/volume_id.h
+++ b/
extras/volume_id/volume_id/volume_id.h
@@
-21,7
+21,9
@@
#ifndef _VOLUME_ID_H_
#define _VOLUME_ID_H_
#ifndef _VOLUME_ID_H_
#define _VOLUME_ID_H_
-#define VOLUME_ID_VERSION 42
+#include <stdint.h>
+
+#define VOLUME_ID_VERSION 50
#define VOLUME_ID_LABEL_SIZE 64
#define VOLUME_ID_UUID_SIZE 36
#define VOLUME_ID_LABEL_SIZE 64
#define VOLUME_ID_UUID_SIZE 36
@@
-44,17
+46,17
@@
struct volume_id_partition {
enum volume_id_usage usage_id;
char *usage;
char *type;
enum volume_id_usage usage_id;
char *usage;
char *type;
- u
nsigned long long
off;
- u
nsigned long long
len;
- u
nsigned int
partition_type_raw;
+ u
int64_t
off;
+ u
int64_t
len;
+ u
int8_t
partition_type_raw;
};
struct volume_id {
};
struct volume_id {
- u
nsigned char
label_raw[VOLUME_ID_LABEL_SIZE];
-
unsigned int
label_raw_len;
+ u
int8_t
label_raw[VOLUME_ID_LABEL_SIZE];
+
size_t
label_raw_len;
char label[VOLUME_ID_LABEL_SIZE+1];
char label[VOLUME_ID_LABEL_SIZE+1];
- u
nsigned char
uuid_raw[VOLUME_ID_UUID_SIZE];
-
unsigned int
uuid_raw_len;
+ u
int8_t
uuid_raw[VOLUME_ID_UUID_SIZE];
+
size_t
uuid_raw_len;
char uuid[VOLUME_ID_UUID_SIZE+1];
enum volume_id_usage usage_id;
char *usage;
char uuid[VOLUME_ID_UUID_SIZE+1];
enum volume_id_usage usage_id;
char *usage;
@@
-62,21
+64,21
@@
struct volume_id {
char type_version[VOLUME_ID_FORMAT_SIZE];
struct volume_id_partition *partitions;
char type_version[VOLUME_ID_FORMAT_SIZE];
struct volume_id_partition *partitions;
-
unsigned int
partition_count;
+
size_t
partition_count;
int fd;
int fd;
- u
nsigned char
*sbbuf;
-
unsigned int
sbbuf_len;
- u
nsigned char
*seekbuf;
- u
nsigned long long
seekbuf_off;
-
unsigned int
seekbuf_len;
- int fd_close;
+ u
int8_t
*sbbuf;
+
size_t
sbbuf_len;
+ u
int8_t
*seekbuf;
+ u
int64_t
seekbuf_off;
+
size_t
seekbuf_len;
+ int fd_close
:1
;
};
extern struct volume_id *volume_id_open_fd(int fd);
extern struct volume_id *volume_id_open_node(const char *path);
extern struct volume_id *volume_id_open_dev_t(dev_t devt);
};
extern struct volume_id *volume_id_open_fd(int fd);
extern struct volume_id *volume_id_open_node(const char *path);
extern struct volume_id *volume_id_open_dev_t(dev_t devt);
-extern int volume_id_probe_all(struct volume_id *id, u
nsigned long long off, unsigned long long
size);
+extern int volume_id_probe_all(struct volume_id *id, u
int64_t off, uint64_t
size);
extern void volume_id_close(struct volume_id *id);
#endif
extern void volume_id_close(struct volume_id *id);
#endif