Skip to contentSkip to conversation

ARRAY_SIZE in linux-2.6.25-rc2/scripts/mod/modpost.c

PATCH In review Mark Pearson 2 participants 2 messages Feb 16, 2008 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARRAY_SIZE in linux-2.6.25-rc2/scripts/mod/modpost.c

Hi

I was looking through the TODO list at kernel janitors and thought I would see if there was any clean-up work I could do. I found a message about replacing sizeof code for array structures with the ARRAY_SIZE macro. If this is useful, I can go through the list of modules I found to require this patch.

As this is the first time I'm delivering a patch, could someone comment if the format, etc. is ok? If so I will continue with the other modules.
BTW: I'm check on the mailing archives to ensure I'm not repeating work already completed by someone else.

--- linux-2.6.25-rc2-mpe/scripts/mod/modpost.c 2008-02-16 19:06:58.000000000 +0100
+++ linux-2.6.25-rc2/scripts/mod/modpost.c 2008-02-15
21:57:20.000000000 +0100
@@ -882,7 +882,7 @@
static int section_mismatch(const char *fromsec, const char *tosec)

 {
        int i;
-       int elems = ARRAY_SIZE(sectioncheck);
+       int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
        const struct sectioncheck *check = &sectioncheck[0];
 
        for (i = 0; i < elems; i++) {

--

Cheers, Mark.

#1 lore raw
Quoted 8 lines · Mark Pearson

Hi

I was looking through the TODO list at kernel janitors and thought I would see if there was any clean-up work I could do. I found a message about replacing sizeof code for array structures with the ARRAY_SIZE macro. If this is useful, I can go through the list of modules I found to require this patch.

Quoted 4 lines

As this is the first time I'm delivering a patch, could someone comment if the format, etc. is ok? If so I will continue with the other modules.
BTW: I'm check on the mailing archives to ensure I'm not repeating work already completed by someone else.

Missing Signed-off-by and a real commit message.

Quoted 4 lines

--- linux-2.6.25-rc2-mpe/scripts/mod/modpost.c 2008-02-16 19:06:58.000000000 +0100
+++ linux-2.6.25-rc2/scripts/mod/modpost.c 2008-02-15
21:57:20.000000000 +0100

Patch is word-wrapped.

Review line 885

Quoted 6 lines
(quoted diff) +1 -1
@@ -882,7 +882,7 @@
 static int section_mismatch(const char *fromsec, const char *tosec)
 {
        int i;
-       int elems = ARRAY_SIZE(sectioncheck);
+       int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);

And looks to be reversed (want to be adding ARRAY_SIZE(), not removing it).

Thanks,
Nish