[PATCH] rock: lindent rock.h

So we have a couple of rock-ridge bugs.  First up, rotoroot the poor thing
into something which it is possible to work on.

Feed rock.h through Lindent, tidy a couple of things by hand.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2005-06-21 17:16:48 -07:00 committed by Linus Torvalds
parent 7373909de4
commit a089221c5e

View file

@ -1,85 +1,88 @@
/* These structs are used by the system-use-sharing protocol, in which the /*
Rock Ridge extensions are embedded. It is quite possible that other * These structs are used by the system-use-sharing protocol, in which the
extensions are present on the disk, and this is fine as long as they * Rock Ridge extensions are embedded. It is quite possible that other
all use SUSP */ * extensions are present on the disk, and this is fine as long as they
* all use SUSP
*/
struct SU_SP{ struct SU_SP {
unsigned char magic[2]; unsigned char magic[2];
unsigned char skip; unsigned char skip;
} __attribute__((packed)); } __attribute__ ((packed));
struct SU_CE{ struct SU_CE {
char extent[8]; char extent[8];
char offset[8]; char offset[8];
char size[8]; char size[8];
}; };
struct SU_ER{ struct SU_ER {
unsigned char len_id; unsigned char len_id;
unsigned char len_des; unsigned char len_des;
unsigned char len_src; unsigned char len_src;
unsigned char ext_ver; unsigned char ext_ver;
char data[0]; char data[0];
} __attribute__((packed)); } __attribute__ ((packed));
struct RR_RR{ struct RR_RR {
char flags[1]; char flags[1];
} __attribute__((packed)); } __attribute__ ((packed));
struct RR_PX{ struct RR_PX {
char mode[8]; char mode[8];
char n_links[8]; char n_links[8];
char uid[8]; char uid[8];
char gid[8]; char gid[8];
}; };
struct RR_PN{ struct RR_PN {
char dev_high[8]; char dev_high[8];
char dev_low[8]; char dev_low[8];
}; };
struct SL_component {
unsigned char flags;
unsigned char len;
char text[0];
} __attribute__ ((packed));
struct SL_component{ struct RR_SL {
unsigned char flags; unsigned char flags;
unsigned char len; struct SL_component link;
char text[0]; } __attribute__ ((packed));
} __attribute__((packed));
struct RR_SL{ struct RR_NM {
unsigned char flags; unsigned char flags;
struct SL_component link; char name[0];
} __attribute__((packed)); } __attribute__ ((packed));
struct RR_NM{ struct RR_CL {
unsigned char flags; char location[8];
char name[0];
} __attribute__((packed));
struct RR_CL{
char location[8];
}; };
struct RR_PL{ struct RR_PL {
char location[8]; char location[8];
}; };
struct stamp{ struct stamp {
char time[7]; char time[7];
} __attribute__((packed)); } __attribute__ ((packed));
struct RR_TF{ struct RR_TF {
char flags; char flags;
struct stamp times[0]; /* Variable number of these beasts */ struct stamp times[0]; /* Variable number of these beasts */
} __attribute__((packed)); } __attribute__ ((packed));
/* Linux-specific extension for transparent decompression */ /* Linux-specific extension for transparent decompression */
struct RR_ZF{ struct RR_ZF {
char algorithm[2]; char algorithm[2];
char parms[2]; char parms[2];
char real_size[8]; char real_size[8];
}; };
/* These are the bits and their meanings for flags in the TF structure. */ /*
* These are the bits and their meanings for flags in the TF structure.
*/
#define TF_CREATE 1 #define TF_CREATE 1
#define TF_MODIFY 2 #define TF_MODIFY 2
#define TF_ACCESS 4 #define TF_ACCESS 4
@ -89,31 +92,31 @@ struct RR_ZF{
#define TF_EFFECTIVE 64 #define TF_EFFECTIVE 64
#define TF_LONG_FORM 128 #define TF_LONG_FORM 128
struct rock_ridge{ struct rock_ridge {
char signature[2]; char signature[2];
unsigned char len; unsigned char len;
unsigned char version; unsigned char version;
union{ union {
struct SU_SP SP; struct SU_SP SP;
struct SU_CE CE; struct SU_CE CE;
struct SU_ER ER; struct SU_ER ER;
struct RR_RR RR; struct RR_RR RR;
struct RR_PX PX; struct RR_PX PX;
struct RR_PN PN; struct RR_PN PN;
struct RR_SL SL; struct RR_SL SL;
struct RR_NM NM; struct RR_NM NM;
struct RR_CL CL; struct RR_CL CL;
struct RR_PL PL; struct RR_PL PL;
struct RR_TF TF; struct RR_TF TF;
struct RR_ZF ZF; struct RR_ZF ZF;
} u; } u;
}; };
#define RR_PX 1 /* POSIX attributes */ #define RR_PX 1 /* POSIX attributes */
#define RR_PN 2 /* POSIX devices */ #define RR_PN 2 /* POSIX devices */
#define RR_SL 4 /* Symbolic link */ #define RR_SL 4 /* Symbolic link */
#define RR_NM 8 /* Alternate Name */ #define RR_NM 8 /* Alternate Name */
#define RR_CL 16 /* Child link */ #define RR_CL 16 /* Child link */
#define RR_PL 32 /* Parent link */ #define RR_PL 32 /* Parent link */
#define RR_RE 64 /* Relocation directory */ #define RR_RE 64 /* Relocation directory */
#define RR_TF 128 /* Timestamps */ #define RR_TF 128 /* Timestamps */