diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-06-21 20:16:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:38 -0400 |
| commit | 642217c17b9a56c7e4cf48f6a13dfd5e4a4c2e10 (patch) | |
| tree | 4f6d979e1092e7517eb84a5c2d2ab81c007cff54 /fs/isofs | |
| parent | e595447e177b39aa6c96baaa57b30cde2d8b9df7 (diff) | |
[PATCH] rock: rename union members
The silly thing does:
struct foo { ... };
...
#define foo 42
so you can no longer refer to `struct foo' in C code.
Rename the structures.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/isofs')
| -rw-r--r-- | fs/isofs/rock.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h index 9d3cbc762380..ed09e2b08637 100644 --- a/fs/isofs/rock.h +++ b/fs/isofs/rock.h | |||
| @@ -5,18 +5,18 @@ | |||
| 5 | * all use SUSP | 5 | * all use SUSP |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | struct SU_SP { | 8 | struct SU_SP_s { |
| 9 | unsigned char magic[2]; | 9 | unsigned char magic[2]; |
| 10 | unsigned char skip; | 10 | unsigned char skip; |
| 11 | } __attribute__ ((packed)); | 11 | } __attribute__ ((packed)); |
| 12 | 12 | ||
| 13 | struct SU_CE { | 13 | struct SU_CE_s { |
| 14 | char extent[8]; | 14 | char extent[8]; |
| 15 | char offset[8]; | 15 | char offset[8]; |
| 16 | char size[8]; | 16 | char size[8]; |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | struct SU_ER { | 19 | struct SU_ER_s { |
| 20 | unsigned char len_id; | 20 | unsigned char len_id; |
| 21 | unsigned char len_des; | 21 | unsigned char len_des; |
| 22 | unsigned char len_src; | 22 | unsigned char len_src; |
| @@ -24,18 +24,18 @@ struct SU_ER { | |||
| 24 | char data[0]; | 24 | char data[0]; |
| 25 | } __attribute__ ((packed)); | 25 | } __attribute__ ((packed)); |
| 26 | 26 | ||
| 27 | struct RR_RR { | 27 | struct RR_RR_s { |
| 28 | char flags[1]; | 28 | char flags[1]; |
| 29 | } __attribute__ ((packed)); | 29 | } __attribute__ ((packed)); |
| 30 | 30 | ||
| 31 | struct RR_PX { | 31 | struct RR_PX_s { |
| 32 | char mode[8]; | 32 | char mode[8]; |
| 33 | char n_links[8]; | 33 | char n_links[8]; |
| 34 | char uid[8]; | 34 | char uid[8]; |
| 35 | char gid[8]; | 35 | char gid[8]; |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | struct RR_PN { | 38 | struct RR_PN_s { |
| 39 | char dev_high[8]; | 39 | char dev_high[8]; |
| 40 | char dev_low[8]; | 40 | char dev_low[8]; |
| 41 | }; | 41 | }; |
| @@ -46,21 +46,21 @@ struct SL_component { | |||
| 46 | char text[0]; | 46 | char text[0]; |
| 47 | } __attribute__ ((packed)); | 47 | } __attribute__ ((packed)); |
| 48 | 48 | ||
| 49 | struct RR_SL { | 49 | struct RR_SL_s { |
| 50 | unsigned char flags; | 50 | unsigned char flags; |
| 51 | struct SL_component link; | 51 | struct SL_component link; |
| 52 | } __attribute__ ((packed)); | 52 | } __attribute__ ((packed)); |
| 53 | 53 | ||
| 54 | struct RR_NM { | 54 | struct RR_NM_s { |
| 55 | unsigned char flags; | 55 | unsigned char flags; |
| 56 | char name[0]; | 56 | char name[0]; |
| 57 | } __attribute__ ((packed)); | 57 | } __attribute__ ((packed)); |
| 58 | 58 | ||
| 59 | struct RR_CL { | 59 | struct RR_CL_s { |
| 60 | char location[8]; | 60 | char location[8]; |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | struct RR_PL { | 63 | struct RR_PL_s { |
| 64 | char location[8]; | 64 | char location[8]; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| @@ -68,13 +68,13 @@ struct stamp { | |||
| 68 | char time[7]; | 68 | char time[7]; |
| 69 | } __attribute__ ((packed)); | 69 | } __attribute__ ((packed)); |
| 70 | 70 | ||
| 71 | struct RR_TF { | 71 | struct RR_TF_s { |
| 72 | char flags; | 72 | char flags; |
| 73 | struct stamp times[0]; /* Variable number of these beasts */ | 73 | struct stamp times[0]; /* Variable number of these beasts */ |
| 74 | } __attribute__ ((packed)); | 74 | } __attribute__ ((packed)); |
| 75 | 75 | ||
| 76 | /* Linux-specific extension for transparent decompression */ | 76 | /* Linux-specific extension for transparent decompression */ |
| 77 | struct RR_ZF { | 77 | struct RR_ZF_s { |
| 78 | char algorithm[2]; | 78 | char algorithm[2]; |
| 79 | char parms[2]; | 79 | char parms[2]; |
| 80 | char real_size[8]; | 80 | char real_size[8]; |
| @@ -97,18 +97,18 @@ struct rock_ridge { | |||
| 97 | unsigned char len; | 97 | unsigned char len; |
| 98 | unsigned char version; | 98 | unsigned char version; |
| 99 | union { | 99 | union { |
| 100 | struct SU_SP SP; | 100 | struct SU_SP_s SP; |
| 101 | struct SU_CE CE; | 101 | struct SU_CE_s CE; |
| 102 | struct SU_ER ER; | 102 | struct SU_ER_s ER; |
| 103 | struct RR_RR RR; | 103 | struct RR_RR_s RR; |
| 104 | struct RR_PX PX; | 104 | struct RR_PX_s PX; |
| 105 | struct RR_PN PN; | 105 | struct RR_PN_s PN; |
| 106 | struct RR_SL SL; | 106 | struct RR_SL_s SL; |
| 107 | struct RR_NM NM; | 107 | struct RR_NM_s NM; |
| 108 | struct RR_CL CL; | 108 | struct RR_CL_s CL; |
| 109 | struct RR_PL PL; | 109 | struct RR_PL_s PL; |
| 110 | struct RR_TF TF; | 110 | struct RR_TF_s TF; |
| 111 | struct RR_ZF ZF; | 111 | struct RR_ZF_s ZF; |
| 112 | } u; | 112 | } u; |
| 113 | }; | 113 | }; |
| 114 | 114 | ||