chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: replace __packed__ by PACKED macro
[elogind.git]
/
extras
/
volume_id
/
libvolume_id
/
udf.c
diff --git
a/extras/volume_id/libvolume_id/udf.c
b/extras/volume_id/libvolume_id/udf.c
index fede1ce68ae161cbfa2c7a2fd4e89a22e7634e8c..f0e0d419572d28e32dc00bcf102d3205d0dcfe61 100644
(file)
--- a/
extras/volume_id/libvolume_id/udf.c
+++ b/
extras/volume_id/libvolume_id/udf.c
@@
-37,28
+37,28
@@
struct volume_descriptor {
uint16_t crc;
uint16_t crc_len;
uint32_t location;
uint16_t crc;
uint16_t crc_len;
uint32_t location;
- }
__attribute__((__packed__))
tag;
+ }
PACKED
tag;
union {
struct anchor_descriptor {
uint32_t length;
uint32_t location;
union {
struct anchor_descriptor {
uint32_t length;
uint32_t location;
- }
__attribute__((__packed__))
anchor;
+ }
PACKED
anchor;
struct primary_descriptor {
uint32_t seq_num;
uint32_t desc_num;
struct dstring {
uint8_t clen;
uint8_t c[31];
struct primary_descriptor {
uint32_t seq_num;
uint32_t desc_num;
struct dstring {
uint8_t clen;
uint8_t c[31];
- }
__attribute__((__packed__))
ident;
- }
__attribute__((__packed__))
primary;
- }
__attribute__((__packed__))
type;
-}
__attribute__((__packed__))
;
+ }
PACKED
ident;
+ }
PACKED
primary;
+ }
PACKED
type;
+}
PACKED
;
struct volume_structure_descriptor {
uint8_t type;
uint8_t id[5];
uint8_t version;
struct volume_structure_descriptor {
uint8_t type;
uint8_t id[5];
uint8_t version;
-}
__attribute__((__packed__))
;
+}
PACKED
;
#define UDF_VSD_OFFSET 0x8000
#define UDF_VSD_OFFSET 0x8000