Module Name: src
Committed By: christos
Date: Fri Oct 18 19:54:00 UTC 2013
Modified Files:
src/lib/libcurses: mvwin.c
src/lib/libmenu: internals.c
Log Message:
fix unused warnings
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libcurses/mvwin.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libmenu/internals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/mvwin.c
diff -u src/lib/libcurses/mvwin.c:1.17 src/lib/libcurses/mvwin.c:1.18
--- src/lib/libcurses/mvwin.c:1.17 Fri Sep 28 02:03:45 2012
+++ src/lib/libcurses/mvwin.c Fri Oct 18 15:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mvwin.c,v 1.17 2012/09/28 06:03:45 blymn Exp $ */
+/* $NetBSD: mvwin.c,v 1.18 2013/10/18 19:53:59 christos Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mvwin.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: mvwin.c,v 1.17 2012/09/28 06:03:45 blymn Exp $");
+__RCSID("$NetBSD: mvwin.c,v 1.18 2013/10/18 19:53:59 christos Exp $");
#endif
#endif /* not lint */
@@ -52,7 +52,7 @@ int
mvderwin(WINDOW *win, int dy, int dx)
{
WINDOW *parent;
- int x, y, i;
+ int x, i;
__LINE *lp, *olp;
#ifdef HAVE_WCHAR
__LDATA *cp;
@@ -73,7 +73,6 @@ mvderwin(WINDOW *win, int dy, int dx)
return ERR;
x = parent->begx + dx;
- y = parent->begy + dy;
win->ch_off = x;
/* Point the line pointers to line space */
Index: src/lib/libmenu/internals.c
diff -u src/lib/libmenu/internals.c:1.16 src/lib/libmenu/internals.c:1.17
--- src/lib/libmenu/internals.c:1.16 Sun Dec 30 07:27:09 2012
+++ src/lib/libmenu/internals.c Fri Oct 18 15:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: internals.c,v 1.16 2012/12/30 12:27:09 blymn Exp $ */
+/* $NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn ([email protected], [email protected])
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: internals.c,v 1.16 2012/12/30 12:27:09 blymn Exp $");
+__RCSID("$NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $");
#include <menu.h>
#include <ctype.h>
@@ -517,7 +517,7 @@ _menui_draw_item(MENU *menu, int item)
int
_menui_draw_menu(MENU *menu)
{
- int rowmajor, i, j, k, row = -1, col = -1, stride;
+ int rowmajor, i, j, k, row = -1, stride;
int incr, cur_row, offset, row_count;
rowmajor = ((menu->opts & O_ROWMAJOR) == O_ROWMAJOR);
@@ -555,7 +555,6 @@ _menui_draw_menu(MENU *menu)
wattrset(menu->scrwin, menu->back);
if (row < 0) {
row = menu->items[menu->item_count - 1]->row;
- col = menu->items[menu->item_count - 1]->col;
}
wmove(menu->scrwin, cur_row,