inline expand some function calls

[unix-history] / usr / src / usr.bin / window / wwredrawwin.c

diff --git a/usr/src/usr.bin/window/wwredrawwin.c b/usr/src/usr.bin/window/wwredrawwin.c
index 2d684ab..7df4840 100644 (file)
--- a/usr/src/usr.bin/window/wwredrawwin.c
+++ b/usr/src/usr.bin/window/wwredrawwin.c
@@ -1,19 +1,12 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwredrawwin.c       3.4 83/09/14";
+static char *sccsid = "@(#)wwredrawwin.c       3.6 83/09/15";

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

-wwredrawwin(w)
+wwredrawwin1(w, row1, row2, offset)

 register struct ww *w;
 register struct ww *w;

-{
-       wwredrawwin1(w, w->ww_i.t - w->ww_w.t, w->ww_i.b - w->ww_w.t,
-               w->ww_scroll);
-}
-
-wwredrawwin1(w, row1, row2, scroll)
-register struct ww *w;
-int row1, row2, scroll;
+int row1, row2, offset;

 {
        int i;
        register j;
 {
        int i;
        register j;


@@ -23,12 +16,12 @@ int row1, row2, scroll;
        register union ww_char *ns;
        char *touched;
 
        register union ww_char *ns;
        char *touched;
 

-       touched = &wwtouched[row1 + w->ww_w.t];
+       touched = &wwtouched[row1];

        for (i = row1; i < row2; i++, touched++) {
        for (i = row1; i < row2; i++, touched++) {

-               ns = &wwns[i + w->ww_w.t][w->ww_i.l];
-               smap = &wwsmap[i + w->ww_w.t][w->ww_i.l];
-               buf = &w->ww_buf[scroll + i][w->ww_i.l - w->ww_w.l];
-               win = &w->ww_win[i][w->ww_i.l - w->ww_w.l];
+               ns = &wwns[i][w->ww_i.l];
+               smap = &wwsmap[i][w->ww_i.l];
+               buf = &w->ww_buf[i + offset][w->ww_i.l];
+               win = &w->ww_win[i][w->ww_i.l];

                for (j = w->ww_i.nc; --j >= 0;)
                        if (*smap++ != w->ww_index)
                                win++, ns++, buf++;
                for (j = w->ww_i.nc; --j >= 0;)
                        if (*smap++ != w->ww_index)
                                win++, ns++, buf++;