Removed some uses of uninitialized variables in update.c, presumably remnands of...

Fixed a few cases where free-ed memory blocks were subsequently read.
Removed some unused variables, #includes, other small cleanup.

diff --git a/lib/curses/beep.c b/lib/curses/beep.c
index 1fa9a4fff007c159e39c719ac4b7ac815c38eb93..aa6fced2e1e849963f7c340c013c11f21d5ca764 100644 (file)
--- a/lib/curses/beep.c
+++ b/lib/curses/beep.c
@@ -1,5 +1,4 @@
 #include <curses.h>
-#include "curspriv.h"
 #include <termcap.h>
 
 extern char *bl, *vb;

diff --git a/lib/curses/charpick.c b/lib/curses/charpick.c
index 5c76db4ac08182397e7f548211862a516bb2912e..4b464a38229301538719327c0294443bceed8fe1 100644 (file)
--- a/lib/curses/charpick.c
+++ b/lib/curses/charpick.c
@@ -1,5 +1,4 @@
 #include <curses.h>
-#include "curspriv.h"
 
 /****************************************************************/
 /* Winch(win) returns the character at the current position in */

diff --git a/lib/curses/curs_set.c b/lib/curses/curs_set.c
index 3bf5ec15383247009ac2f27e8e795435c6e4a974..e481d59b296adee0703de8cf47d71791e51e6421 100644 (file)
--- a/lib/curses/curs_set.c
+++ b/lib/curses/curs_set.c
@@ -1,5 +1,4 @@
 #include <curses.h>
-#include "curspriv.h"
 #include <termcap.h>
 
 extern char *vi, *ve, *vs;

diff --git a/lib/curses/curspriv.h b/lib/curses/curspriv.h
index af53d177b28cebb0518a5feb73a3a4b1e073e41f..9fd616b0f01a625f5cfdc0443cf7152685f9c3bd 100644 (file)
--- a/lib/curses/curspriv.h
+++ b/lib/curses/curspriv.h
@@ -4,7 +4,7 @@
 #define        _FULLWIN        4               /* window fills screen */
 #define        _SCROLLWIN      8               /* window lwr rgt is screen lwr rgt */
 
-#define        _NO_CHANGE      -1              /* flags line edge unchanged */
+#define        _NO_CHANGE      (-1)            /* flags line edge unchanged */
 #define        _BREAKCHAR      0x03            /* ^C character */
 #define _DCCHAR                0x08            /* Delete Char char (BS) */
 #define _DLCHAR                0x1b            /* Delete Line char (ESC) */

diff --git a/lib/curses/newwin.c b/lib/curses/newwin.c
index 69214707ec6b0eabeee77ea1dd0e8cacad76b4f6..23f2471a6722f6261d1c089674514866d20aca4e 100644 (file)
--- a/lib/curses/newwin.c
+++ b/lib/curses/newwin.c
@@ -27,14 +27,14 @@ int num_lines, num_columns, begy, begx;
 
   /* Allocate the minchng and maxchng arrays */
   if ((win->_minchng = (int *) calloc(num_lines, sizeof(int))) == NULL) {
-       free(win);
        free(win->_line);
+       free(win);
        return((WINDOW *) ERR);
   }
   if ((win->_maxchng = (int *) calloc(num_lines, sizeof(int))) == NULL) {
-       free(win);
        free(win->_line);
        free(win->_minchng);
+       free(win);
        return((WINDOW *) ERR);
   }
 

diff --git a/lib/curses/options.c b/lib/curses/options.c
index 00c888915053567aa68bfabd4a4fafe45e135da1..2ab0ac3c4e7af18ff104f046c8f850dad4376259 100644 (file)
--- a/lib/curses/options.c
+++ b/lib/curses/options.c
@@ -1,9 +1,6 @@
 #include <curses.h>
 #include "curspriv.h"
 
-static bool hasold = FALSE;    /* for remembering old cursor type */
-static int oldmode;
-
 /****************************************************************/
 /* Idlok() is used to set  flag for using the terminal insert/ */
 /* Delete line capabilities. This is not relevant for the PC   */

diff --git a/lib/curses/update.c b/lib/curses/update.c
index 968ca9836da7051e5be3737b5a0c53f8b2206702..44632608555b27d4d31d0150ac0a054a938d947d 100644 (file)
--- a/lib/curses/update.c
+++ b/lib/curses/update.c
@@ -112,13 +112,10 @@ WINDOW *scr;
 /* Like the corresponding line in _cursvar.tmpwin.             */
 /****************************************************************/
 
-static void transformline(lineno)
-register int lineno;
+static void transformline(register int lineno)
 {
   register int *dstp;
   register int *srcp;
-  register int dstc;
-  register int srcc;
   int x;
   int endx;
 
@@ -128,9 +125,9 @@ register int lineno;
   srcp = twin->_line[lineno] + x;
 
   while (x <= endx) {
-       if ((*dstp != *srcp) || (dstc != srcc)) {
+       if (*dstp != *srcp) {
                gotoxy(lineno, x);
-               while (x <= endx && ((*dstp != *srcp) || (dstc != srcc))) {
+               while (x <= endx && (*dstp != *srcp)) {
                        Putchar(*srcp);
                        *dstp++ = *srcp++;
                        x++;