7d16964c3
David Marchand
2014-07-04
Subject
modinfo: fix module parsing with kernel >= 2.6.37
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/modinfo.c+4 -3
| @@ -34,14 +34,14 @@ struct modinfo_env { | |
| int tags; | |
| }; | |
| - | static int display(const char *data, const char *pattern, int flag) |
| + | static void display(const char *data, const char *pattern, int flag) |
| { | |
| if (flag) { | |
| int n = printf("%s:", pattern); | |
| while (n++ < 16) | |
| bb_putchar(' '); | |
| } | |
| - | return printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n'); |
| + | printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n'); |
| } | |
| static void modinfo(const char *path, const char *version, | |
| @@ -104,7 +104,8 @@ static void modinfo(const char *path, const char *version, | |
| /* field prefixes are 0x80 or 0x00 */ | |
| if ((ptr[-1] & 0x7F) == '\0') { | |
| ptr += length + 1; | |
| - | ptr += display(ptr, pattern, (1<<j) != tags); |
| + | display(ptr, pattern, (1<<j) != tags); |
| + | ptr += strlen(ptr); |
| } | |
| } | |
| ++ptr; | |