Numerous (TINY) fixes: mostly unused variables...

This commit is contained in:
ddouthitt
2001-10-05 22:04:35 +00:00
parent 16cce2fe2d
commit ae18a158fc
8 changed files with 22 additions and 21 deletions
+3 -3
View File
@@ -325,7 +325,7 @@ client_del_key_func (client * c, int argc, char **argv)
int int
screen_add_key_func (client * c, int argc, char **argv) screen_add_key_func (client * c, int argc, char **argv)
{ {
widget * w ; /* Keys are stored on a WID_KEYS widget */ //widget * w ; /* Keys are stored on a WID_KEYS widget */
screen * s ; /* Attached to a specific screen */ screen * s ; /* Attached to a specific screen */
char * id ; /* Screen ID */ char * id ; /* Screen ID */
char * keys ; /* Keys wanted */ char * keys ; /* Keys wanted */
@@ -397,7 +397,7 @@ screen_add_key_func (client * c, int argc, char **argv)
int int
screen_del_key_func (client * c, int argc, char **argv) screen_del_key_func (client * c, int argc, char **argv)
{ {
widget * w ; /* Keys are stored on a WID_KEYS widget */ //widget * w ; /* Keys are stored on a WID_KEYS widget */
screen * s ; /* Attached to a specific screen */ screen * s ; /* Attached to a specific screen */
char * id ; /* Screen ID */ char * id ; /* Screen ID */
char * keys ; /* Keys wanted */ char * keys ; /* Keys wanted */
@@ -1290,7 +1290,7 @@ backlight_func (client * c, int argc, char **argv)
int int
output_func (client * c, int argc, char **argv) output_func (client * c, int argc, char **argv)
{ {
int rc = 0; //int rc = 0;
char str[128]; char str[128];
if (argc != 2) { if (argc != 2) {
+7 -6
View File
@@ -276,8 +276,8 @@ curses_drv_init (struct lcd_logical_driver *driver, char *args)
static void static void
curses_drv_wborder (WINDOW *win) { curses_drv_wborder (WINDOW *win) {
int x, y; //int x, y;
char buf[128]; //char buf[128];
if (has_colors()) { if (has_colors()) {
wcolor_set(win, current_border_pair, NULL); wcolor_set(win, current_border_pair, NULL);
@@ -327,8 +327,8 @@ curses_drv_clear ()
werase (lcd_win); werase (lcd_win);
} }
#define ValidX(a) { if (x > curses_drv->wid) { x = curses_drv->wid; } else x < 1 ? 1 : x; } #define ValidX(x) { if ((x) > curses_drv->wid) { (x) = curses_drv->wid; } else (x) < 1 ? 1 : x; }
#define ValidY(a) { if (y > curses_drv->hgt) { y = curses_drv->hgt; } else y < 1 ? 1 : y; } #define ValidY(y) { if ((y) > curses_drv->hgt) { (y) = curses_drv->hgt; } else (y) < 1 ? 1 : y; }
void void
curses_drv_backlight (int on) curses_drv_backlight (int on)
@@ -354,7 +354,8 @@ curses_drv_backlight (int on)
return; return;
break; break;
} }
curses_drv_clear;
curses_drv_clear();
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -364,7 +365,7 @@ curses_drv_backlight (int on)
void void
curses_drv_string (int x, int y, char *string) curses_drv_string (int x, int y, char *string)
{ {
int i; //int i;
unsigned char *p; unsigned char *p;
ValidX(x); ValidX(x);
+2 -2
View File
@@ -400,7 +400,7 @@ lcd_find_init (char *driver) {
struct lcd_logical_driver * struct lcd_logical_driver *
lcd_allocate_driver () { lcd_allocate_driver () {
struct lcd_logical_driver *driver; struct lcd_logical_driver *driver;
int driver_size; //int driver_size;
// This bit of fakery allows us to use lcd as the first // This bit of fakery allows us to use lcd as the first
// allocated buffer, which is what everything currently uses for // allocated buffer, which is what everything currently uses for
@@ -506,7 +506,7 @@ lcd_add_driver (char *driver, char *args)
int int
lcd_shutdown () lcd_shutdown ()
{ {
lcd_logical_driver *driver; //lcd_logical_driver *driver;
// This does not shutdown any input sources; // This does not shutdown any input sources;
// is that sufficient? // is that sufficient?
+2 -2
View File
@@ -62,7 +62,7 @@ new_framebuf (struct lcd_logical_driver *driver, char *oldbuf) {
void void
insert_str_framebuf (struct lcd_logical_driver *driver, int x, int y, char *string) { insert_str_framebuf (struct lcd_logical_driver *driver, int x, int y, char *string) {
int i; //int i;
char buf[64]; char buf[64];
char *pos; char *pos;
@@ -93,7 +93,7 @@ insert_chr_framebuf (struct lcd_logical_driver *driver, int x, int y, char c) {
x--; y--; x--; y--;
if (x >= driver->wid) driver->wid; if (x >= driver->wid) x = driver->wid;
if (x < 0) x = 0; if (x < 0) x = 0;
if (y >= driver->hgt) y = driver->hgt; if (y >= driver->hgt) y = driver->hgt;
+2 -2
View File
@@ -99,8 +99,8 @@ handle_input ()
char str[15]; char str[15];
int key; int key;
screen *s; screen *s;
widget *w; //widget *w;
client *c; //client *c;
if ((key = lcd_ptr->getkey ()) == 0) if ((key = lcd_ptr->getkey ()) == 0)
return 0; return 0;
+1 -1
View File
@@ -127,7 +127,7 @@ main (int argc, char **argv)
int daemon_mode = 1; int daemon_mode = 1;
int disable_server_screen = 1; int disable_server_screen = 1;
screen *s = NULL; screen *s = NULL;
char *str, *ing; // strings for commandline handling //char *str, *ing; // strings for commandline handling
char user[64]; char user[64];
char c, buf[64], *driverlist[MAX_DRIVERS], *driverargs[MAX_DRIVERS]; char c, buf[64], *driverlist[MAX_DRIVERS], *driverargs[MAX_DRIVERS];
char linebuf[128], driver_name[64]; char linebuf[128], driver_name[64];
+4 -4
View File
@@ -25,14 +25,14 @@
int int
parse_all_client_messages () parse_all_client_messages ()
{ {
int i, j, len; int i; // int j, len;
int newtoken, inquote; //int newtoken, inquote;
client *c; client *c;
char *str, *p, *q, *s; char *str, *p, *q, *s;
// char *tok; // char *tok;
int argc; int argc;
char *argv[256]; char *argv[256];
char delimiters[] = " "; //char delimiters[] = " ";
char leftquote[] = "\"'`([{"; char leftquote[] = "\"'`([{";
char rightquote[] = "\"'`)]}"; char rightquote[] = "\"'`)]}";
char errmsg[256]; char errmsg[256];
@@ -40,7 +40,7 @@ parse_all_client_messages ()
int quoteindex; int quoteindex;
for (i = 0; i <= 256; i++) { for (i = 0; i <= 256; i++) {
argv[i] == NULL; argv[i] = NULL;
} }
#define SEPARATOR_CHAR ' ' #define SEPARATOR_CHAR ' '
+1 -1
View File
@@ -110,7 +110,7 @@ update_server_screen (int timer)
{ {
client *c; client *c;
int num_clients; int num_clients;
screen *s; //screen *s;
int num_screens; int num_screens;
// Draw a title... // Draw a title...