Skip to content

Commit 457cf3d

Browse files
tobluxmaddy-kerneldev
authored andcommitted
powerpc: Fix indentation and replace typedef with struct name
Indent several struct members using tabs instead of spaces. Replace the typedef alias AOUTHDR with an explicit struct name to silence a checkpatch warning. Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20250517125834.421088-2-thorsten.blum@linux.dev
1 parent ab8bbf8 commit 457cf3d

2 files changed

Lines changed: 41 additions & 45 deletions

File tree

arch/powerpc/boot/hack-coff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ main(int ac, char **av)
3131
int i, nsect;
3232
int aoutsz;
3333
struct external_filehdr fhdr;
34-
AOUTHDR aout;
34+
struct aouthdr aout;
3535
struct external_scnhdr shdr;
3636

3737
if (ac != 2) {

arch/powerpc/boot/rs6000.h

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,30 @@ struct external_filehdr {
3232
/********************** AOUT "OPTIONAL HEADER" **********************/
3333

3434

35-
typedef struct
36-
{
37-
unsigned char magic[2]; /* type of file */
38-
unsigned char vstamp[2]; /* version stamp */
39-
unsigned char tsize[4]; /* text size in bytes, padded to FW bdry */
40-
unsigned char dsize[4]; /* initialized data " " */
41-
unsigned char bsize[4]; /* uninitialized data " " */
42-
unsigned char entry[4]; /* entry pt. */
43-
unsigned char text_start[4]; /* base of text used for this file */
44-
unsigned char data_start[4]; /* base of data used for this file */
45-
unsigned char o_toc[4]; /* address of TOC */
46-
unsigned char o_snentry[2]; /* section number of entry point */
47-
unsigned char o_sntext[2]; /* section number of .text section */
48-
unsigned char o_sndata[2]; /* section number of .data section */
49-
unsigned char o_sntoc[2]; /* section number of TOC */
50-
unsigned char o_snloader[2]; /* section number of .loader section */
51-
unsigned char o_snbss[2]; /* section number of .bss section */
52-
unsigned char o_algntext[2]; /* .text alignment */
53-
unsigned char o_algndata[2]; /* .data alignment */
54-
unsigned char o_modtype[2]; /* module type (??) */
55-
unsigned char o_cputype[2]; /* cpu type */
56-
unsigned char o_maxstack[4]; /* max stack size (??) */
57-
unsigned char o_maxdata[4]; /* max data size (??) */
58-
unsigned char o_resv2[12]; /* reserved */
59-
}
60-
AOUTHDR;
35+
struct aouthdr {
36+
unsigned char magic[2]; /* type of file */
37+
unsigned char vstamp[2]; /* version stamp */
38+
unsigned char tsize[4]; /* text size in bytes, padded to FW bdry */
39+
unsigned char dsize[4]; /* initialized data " " */
40+
unsigned char bsize[4]; /* uninitialized data " " */
41+
unsigned char entry[4]; /* entry pt. */
42+
unsigned char text_start[4]; /* base of text used for this file */
43+
unsigned char data_start[4]; /* base of data used for this file */
44+
unsigned char o_toc[4]; /* address of TOC */
45+
unsigned char o_snentry[2]; /* section number of entry point */
46+
unsigned char o_sntext[2]; /* section number of .text section */
47+
unsigned char o_sndata[2]; /* section number of .data section */
48+
unsigned char o_sntoc[2]; /* section number of TOC */
49+
unsigned char o_snloader[2]; /* section number of .loader section */
50+
unsigned char o_snbss[2]; /* section number of .bss section */
51+
unsigned char o_algntext[2]; /* .text alignment */
52+
unsigned char o_algndata[2]; /* .data alignment */
53+
unsigned char o_modtype[2]; /* module type (??) */
54+
unsigned char o_cputype[2]; /* cpu type */
55+
unsigned char o_maxstack[4]; /* max stack size (??) */
56+
unsigned char o_maxdata[4]; /* max data size (??) */
57+
unsigned char o_resv2[12]; /* reserved */
58+
};
6159

6260
#define AOUTSZ 72
6361
#define SMALL_AOUTSZ (28)
@@ -115,10 +113,10 @@ struct external_scnhdr {
115113
*/
116114
struct external_lineno {
117115
union {
118-
char l_symndx[4]; /* function name symbol index, iff l_lnno == 0*/
116+
char l_symndx[4]; /* function name symbol index, iff l_lnno == 0 */
119117
char l_paddr[4]; /* (physical) address of line number */
120118
} l_addr;
121-
char l_lnno[2]; /* line number */
119+
char l_lnno[2]; /* line number */
122120
};
123121

124122

@@ -132,20 +130,19 @@ struct external_lineno {
132130
#define E_FILNMLEN 14 /* # characters in a file name */
133131
#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */
134132

135-
struct external_syment
136-
{
137-
union {
138-
char e_name[E_SYMNMLEN];
139-
struct {
140-
char e_zeroes[4];
141-
char e_offset[4];
142-
} e;
143-
} e;
144-
char e_value[4];
145-
char e_scnum[2];
146-
char e_type[2];
147-
char e_sclass[1];
148-
char e_numaux[1];
133+
struct external_syment {
134+
union {
135+
char e_name[E_SYMNMLEN];
136+
struct {
137+
char e_zeroes[4];
138+
char e_offset[4];
139+
} e;
140+
} e;
141+
char e_value[4];
142+
char e_scnum[2];
143+
char e_type[2];
144+
char e_sclass[1];
145+
char e_numaux[1];
149146
};
150147

151148

@@ -187,7 +184,7 @@ union external_auxent {
187184
} x_file;
188185

189186
struct {
190-
char x_scnlen[4]; /* section length */
187+
char x_scnlen[4]; /* section length */
191188
char x_nreloc[2]; /* # relocation entries */
192189
char x_nlinno[2]; /* # line numbers */
193190
} x_scn;
@@ -207,7 +204,6 @@ union external_auxent {
207204
unsigned char x_stab[4];
208205
unsigned char x_snstab[2];
209206
} x_csect;
210-
211207
};
212208

213209
#define SYMENT struct external_syment

0 commit comments

Comments
 (0)