wwfree changed

SCCS-vsn: usr.bin/window/wwopen.c 3.2
SCCS-vsn: usr.bin/window/wwclose.c 3.2

diff --git a/usr/src/usr.bin/window/wwclose.c b/usr/src/usr.bin/window/wwclose.c
index 20af7fe..bf172f6 100644 (file)
--- a/usr/src/usr.bin/window/wwclose.c
+++ b/usr/src/usr.bin/window/wwclose.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwclose.c   3.1 83/08/11";
+static char *sccsid = "@(#)wwclose.c   3.2 83/08/19";

 #endif
 
 #include "ww.h"
 #endif
 
 #include "ww.h"


@@ -13,8 +13,8 @@ register struct ww *w;
                (void) kill(w->ww_pid, SIGHUP);
        (void) close(w->ww_tty);
        (void) close(w->ww_pty);
                (void) kill(w->ww_pid, SIGHUP);
        (void) close(w->ww_tty);
        (void) close(w->ww_pty);

-       wwfree((char **)w->ww_win, w->ww_w.nr);
-       wwfree((char **)w->ww_cov, w->ww_w.nr);
-       wwfree((char **)w->ww_buf, w->ww_nline);
+       wwfree((char **)w->ww_win);
+       wwfree((char **)w->ww_cov);
+       wwfree((char **)w->ww_buf);

        free((char *)w);
 }
        free((char *)w);
 }

diff --git a/usr/src/usr.bin/window/wwopen.c b/usr/src/usr.bin/window/wwopen.c
index bc1eed3..579a000 100644 (file)
--- a/usr/src/usr.bin/window/wwopen.c
+++ b/usr/src/usr.bin/window/wwopen.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwopen.c    3.1 83/08/11";
+static char *sccsid = "@(#)wwopen.c    3.2 83/08/19";

 #endif
 
 #include "ww.h"
 #endif
 
 #include "ww.h"


@@ -80,16 +80,16 @@ wwopen(flags, nrow, ncol, row, col, nline)
 bad:
        if (w != 0) {
                if (w->ww_win != 0)
 bad:
        if (w != 0) {
                if (w->ww_win != 0)

-                       wwfree(w->ww_win, nrow);
+                       wwfree(w->ww_win);

                if (w->ww_cov != 0)
                if (w->ww_cov != 0)

-                       wwfree(w->ww_cov, nrow);
+                       wwfree(w->ww_cov);

                if (w->ww_buf != 0)
                if (w->ww_buf != 0)

-                       wwfree((char **)w->ww_buf, w->ww_nline);
+                       wwfree((char **)w->ww_buf);

                if (w->ww_nvis != 0)
                        free((char *)w->ww_nvis);
                (void) close(w->ww_tty);
                (void) close(w->ww_pty);
                if (w->ww_nvis != 0)
                        free((char *)w->ww_nvis);
                (void) close(w->ww_tty);
                (void) close(w->ww_pty);

-               cfree((char *)w);
+               free((char *)w);

        }
        return 0;
 }
        }
        return 0;
 }