On Tue, 08 Oct 2013 09:10:37 +0800 Chen Gang <gang.chen@xxxxxxxxxxx> wrote:
> > - Requires that the two literal "Tainted: " strings be kept in sync.
> >
>
> Hmm... if more than 2, we should use a macro instead of, else (within
> 2), especially they are near by, we can still let it hard coded, I feel
> that will more straightful for readers and writers.
>
>
> > - Assumes that strlen("Not tainted") <= strlen("Tainted") +
> > ARRAY_SIZE(tnts). Which is true, but might not be if someone makes
> > changes...
> >
>
> Hmm... it use snprintf() instead of sprintf(), although I feel better
> using scnprintf() instead of.
>
> This string can be trucated, and scnprintf() is more suitable for this
> kind of string. And snprintf() is for the string which can not be
> truncated (will return the ideal length to notify the caller).
It's hardly a huge issue, but I'd do something along the lines of
--- a/kernel/panic.c~a
+++ a/kernel/panic.c
@@ -233,13 +233,16 @@ static const struct tnt tnts[] = {
*/
const char *print_tainted(void)
{
- static char buf[ARRAY_SIZE(tnts) + sizeof("Tainted: ")];
+ static const char tainted[] = "Tainted: ";
+ static const char not_tainted[] = "Not tainted: ";
+ static char buf[ARRAY_SIZE(tnts) +
+ max(sizeof(tainted), sizeof(not_tainted))];
if (tainted_mask) {
char *s;
int i;
- s = buf + sprintf(buf, "Tainted: ");
+ s = buf + sprintf(buf, tainted);
for (i = 0; i < ARRAY_SIZE(tnts); i++) {
const struct tnt *t = &tnts[i];
*s++ = test_bit(t->bit, &tainted_mask) ?
@@ -247,7 +250,7 @@ const char *print_tainted(void)
}
*s = 0;
} else
- snprintf(buf, sizeof(buf), "Not tainted");
+ snprintf(buf, sizeof(buf), not_tainted);
return buf;
}
Except that doesn't compile because of our fancy max().
Maybe we have a compile-time-evaluable max which does plain old
((a < b) ? b : a), not sure... I don't think it's worth bothering
about - leave it be.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
