Hi Alan,
Just one trivial patch this week for 2.2.
Cheers!
Rusty.
Trivial patch update against 2.2.21-pre2:
René Scharfe <l.s.r@web.de>: [PATCH] compiler warnings in scripts_tkgen.c:
this patch fixes two compiler warnings during make xconfig which
turn up if one uses -Wshadow
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal /home/rusty/devel/kernel/linux-2.2.21-pre2/scripts/tkgen.c /home/rusty/devel/kernel/trivial-2.2.21-pre2/scripts/tkgen.c
--- /home/rusty/devel/kernel/linux-2.2.21-pre2/scripts/tkgen.c Mon May 28 13:57:45 2001
+++ /home/rusty/devel/kernel/trivial-2.2.21-pre2/scripts/tkgen.c Mon Feb 18 15:15:43 2002
@@ -587,11 +587,11 @@
case token_int:
if ( cfg->value && *cfg->value == '$' )
{
- int index = get_varnum( cfg->value+1 );
+ int i = get_varnum( cfg->value+1 );
printf( "\n" );
- if ( ! vartable[index].global_written )
+ if ( ! vartable[i].global_written )
{
- global( vartable[index].name );
+ global( vartable[i].name );
}
printf( "\t" );
}
@@ -956,7 +956,6 @@
static void end_proc( struct kconfig * scfg, int menu_num )
{
struct kconfig * cfg;
- int i;
printf( "\n\n\n" );
printf( "\tfocus $w\n" );
@@ -1051,6 +1050,7 @@
{
if ( cfg->token == token_tristate )
{
+ int i;
if ( ! vartable[cfg->nameindex].global_written )
{
vartable[cfg->nameindex].global_written = 1;
-- Anyone who quotes me in their sig is an idiot. -- Rusty Russell. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Feb 23 2002 - 21:00:14 EST