[FIXES] 2.1.125

Adam Sulmicki (adam@cfar.umd.edu)
Sat, 10 Oct 1998 02:24:45 -0400


Hello, this patch includes 3 fixes for the 2.1.125 kernel.
Could you apply them to incoming 126? Thanks.

First two are warnings during compile for 'make menuconfig', shown below:

eax:/usr/src/Linux/21/make-125# make menuconfig
rm -f include/asm
( cd include ; ln -sf asm-i386 asm)
gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -o
scripts/split-include scripts/split-include.c
make -C scripts/lxdialog all
make[1]: Entering directory `/usr/src/Linux/21/make-125/scripts/lxdialog'
[...]
gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -c menubox.c -o menubox.o
menubox.c: In function `print_item':
menubox.c:63: warning: unused variable `i'
gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -DLOCALE -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -c textbox.c -o textbox.o
textbox.c: In function `print_line':
textbox.c:454: warning: unused variable `i'
[..]

===========================================================
--- scripts/lxdialog/menubox.c-ORIG Sat Oct 10 02:12:15 1998
+++ scripts/lxdialog/menubox.c Sat Oct 10 02:13:14 1998
@@ -60,7 +60,7 @@
static void
print_item (WINDOW * win, const char *item, int choice, int selected, int hotkey)
{
- int i, j;
+ int j;
char menu_item[menu_width+1];

strncpy(menu_item, item, menu_width);
@@ -71,7 +71,7 @@
wattrset (win, menubox_attr);
wmove (win, choice, 0);
#if OLD_NCURSES
- for (i = 0; i < menu_width; i++)
+ for (int i = 0; i < menu_width; i++)
waddch (win, ' ');
#else
wclrtoeol(win);
===========================================================
--- scripts/lxdialog/textbox.c-ORIG Sat Oct 10 02:11:55 1998
+++ scripts/lxdialog/textbox.c Sat Oct 10 02:13:44 1998
@@ -451,7 +451,7 @@
static void
print_line (WINDOW * win, int row, int width)
{
- int i, y, x;
+ int y, x;
char *line;

line = get_line ();
@@ -463,7 +463,7 @@
getyx (win, y, x);
/* Clear 'residue' of previous line */
#if OLD_NCURSES
- for (i = 0; i < width - x; i++)
+ for (int i = 0; i < width - x; i++)
waddch (win, ' ');
#else
wclrtoeol(win);
===========================================================

The third one is a problem when compiling UMSDOS. It does not
show up for everyone. I suspect is that may be due to some
obscure GCC bug. HOWEVER, in mine case it is a problem with
kernel, not gcc.

The issue is that umsdos_dentry_operations is declared as
'extern foo umsdos_dentry_operations'
in two other files. However, in the dir.c it is declared as
'static foo umsdos_dentry_operations'. Those two signatures
does not match, and in mine case are correctly flagged as
errors.

===========================================================
--- fs/umsdos/dir.c-ORIG Fri Oct 9 18:23:32 1998
+++ fs/umsdos/dir.c Fri Oct 9 18:23:53 1998
@@ -44,7 +44,7 @@
}
}

-static struct dentry_operations umsdos_dentry_operations =
+struct dentry_operations umsdos_dentry_operations =
{
umsdos_dentry_validate, /* d_validate(struct dentry *) */
NULL, /* d_hash */
===========================================================

-Adam

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/