Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ca820181fc187af316a18b2700582663662c4012
Commit:     ca820181fc187af316a18b2700582663662c4012
Parent:     d08df601a30df9e36c29f3214315f4f0c8784c68
Author:     Robert P. J. Day <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 17 19:10:01 2007 +0100
Committer:  Adrian Bunk <[EMAIL PROTECTED]>
CommitDate: Sat Feb 17 19:10:01 2007 +0100

    Use ARRAY_SIZE() macro in i386 relocs.c file
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
 arch/i386/boot/compressed/relocs.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/i386/boot/compressed/relocs.c 
b/arch/i386/boot/compressed/relocs.c
index 881951c..ce4fda2 100644
--- a/arch/i386/boot/compressed/relocs.c
+++ b/arch/i386/boot/compressed/relocs.c
@@ -11,6 +11,7 @@
 #include <endian.h>
 
 #define MAX_SHDRS 100
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 static Elf32_Ehdr ehdr;
 static Elf32_Shdr shdr[MAX_SHDRS];
 static Elf32_Sym  *symtab[MAX_SHDRS];
@@ -71,7 +72,7 @@ static const char *sym_type(unsigned type)
 #undef SYM_TYPE
        };
        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];
        }
        return name;
@@ -87,7 +88,7 @@ static const char *sym_bind(unsigned bind)
 #undef SYM_BIND
        };
        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];
        }
        return name;
@@ -104,7 +105,7 @@ static const char *sym_visibility(unsigned visibility)
 #undef SYM_VISIBILITY
        };
        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];
        }
        return name;
@@ -128,7 +129,7 @@ static const char *rel_type(unsigned type)
 #undef REL_TYPE
        };
        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];
        }
        return name;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to