Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Use ARRAY_SIZE() macro in i386 relocs.c file

Browse source 
Change the explicit code in the relocs.c file to use ARRAY_SIZE()
and add a definition of ARRAY_SIZE() since this is a userspace program
and wouldn't include kernel.h.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Robert P. J. Day 2007-02-17 19:10:01 +01:00 committed by Adrian Bunk
parent d08df601a3
commit ca820181fc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/i386/boot/compressed/relocs.c
View file

@ -11,6 +11,7 @@
#include <endian.h> #include <endian.h>
#define MAX_SHDRS 100 #define MAX_SHDRS 100
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
static Elf32_Ehdr ehdr; static Elf32_Ehdr ehdr;
static Elf32_Shdr shdr[MAX_SHDRS]; static Elf32_Shdr shdr[MAX_SHDRS];
static Elf32_Sym *symtab[MAX_SHDRS]; static Elf32_Sym *symtab[MAX_SHDRS];
@ -71,7 +72,7 @@ static const char *sym_type(unsigned type)
#undef SYM_TYPE #undef SYM_TYPE
}; };
const char *name = "unknown sym type name"; const char *name = "unknown sym type name";
if (type < sizeof(type_name)/sizeof(type_name[0])) { if (type < ARRAY_SIZE(type_name)) {
name = type_name[type]; name = type_name[type];
} }
return name; return name;
@ -87,7 +88,7 @@ static const char *sym_bind(unsigned bind)
#undef SYM_BIND #undef SYM_BIND
}; };
const char *name = "unknown sym bind name"; const char *name = "unknown sym bind name";
if (bind < sizeof(bind_name)/sizeof(bind_name[0])) { if (bind < ARRAY_SIZE(bind_name)) {
name = bind_name[bind]; name = bind_name[bind];
} }
return name; return name;
@ -104,7 +105,7 @@ static const char *sym_visibility(unsigned visibility)
#undef SYM_VISIBILITY #undef SYM_VISIBILITY
}; };
const char *name = "unknown sym visibility name"; const char *name = "unknown sym visibility name";
if (visibility < sizeof(visibility_name)/sizeof(visibility_name[0])) { if (visibility < ARRAY_SIZE(visibility_name)) {
name = visibility_name[visibility]; name = visibility_name[visibility];
} }
return name; return name;
@ -128,7 +129,7 @@ static const char *rel_type(unsigned type)
#undef REL_TYPE #undef REL_TYPE
}; };
const char *name = "unknown type rel type name"; const char *name = "unknown type rel type name";
if (type < sizeof(type_name)/sizeof(type_name[0])) { if (type < ARRAY_SIZE(type_name)) {
name = type_name[type]; name = type_name[type];
} }
return name; return name;