Get rid of FieldForward, FieldReverse, and Terminal (Terminal

from here at least).

SCCS-vsn: usr.bin/tn3270/general/genbsubs.c 1.3
SCCS-vsn: usr.bin/tn3270/general/globals.c 1.4
SCCS-vsn: usr.bin/tn3270/general/globals.h 1.2

diff --git a/usr/src/usr.bin/tn3270/general/genbsubs.c b/usr/src/usr.bin/tn3270/general/genbsubs.c
index ad4b4de..211d57d 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/genbsubs.c
+++ b/usr/src/usr.bin/tn3270/general/genbsubs.c
@@ -63,35 +63,7 @@ register int b;
 }
 
 /*
 }
 
 /*

- * memNIchr(const void *s, int c, size_t n, int and)
- *
- * Like memchr, but the comparison is '((*s)&and) == c'.
- *
- */
-
-unsigned char *
-memNIchr(s, c, n, and)
-char *s;
-int c;
-unsigned int n;
-int and;
-{
-    register unsigned char _c, *_s, _and;
-
-    _and = and;
-    _c = (c&_and);
-    _s = (unsigned char *)s;
-    while (n--) {
-       if (((*_s)&_and) == _c) {
-           return _s;
-       }
-       _s++;
-    }
-    return 0;
-}
-
-/*
- * memNDchr(const void *s, int c, size_t n, int and)
+ * memNSchr(const void *s, int c, size_t n, int and)

  *
  * Like memchr, but the comparison is '((*s)&and) == c',
  * and we increment our way through s by "stride" ('s += stride').
  *
  * Like memchr, but the comparison is '((*s)&and) == c',
  * and we increment our way through s by "stride" ('s += stride').

diff --git a/usr/src/usr.bin/tn3270/general/globals.c b/usr/src/usr.bin/tn3270/general/globals.c
index 5ee9f07..ccd259c 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/globals.c
+++ b/usr/src/usr.bin/tn3270/general/globals.c
@@ -41,6 +41,12 @@ static       char    sccsid[] = "@(#)globals.c       3.1  10/29/86";
 
 #include       "../general.h"
 
 
 #include       "../general.h"
 

+#if    defined(SLOWSCREEN)
+
+ScreenImage Terminal[MAXSCREENSIZE];
+
+#endif /* defined(SLOWSCREEN) */
+

 /*
  * init_system()
  *
 /*
  * init_system()
  *


@@ -55,11 +61,6 @@ init_system()
     OptAlphaInNumeric = OptHome = OptLeftMargin = OptWordWrap = 0;
 
     ClearArray(Host);
     OptAlphaInNumeric = OptHome = OptLeftMargin = OptWordWrap = 0;
 
     ClearArray(Host);

-#if    defined(SLOWSCREEN)
-    ClearArray(Terminal);
-#endif /* defined(SLOWSCREEN) */
-    ClearArray(FieldForward);
-    ClearArray(FieldReverse);

     CursorAddress = BufferAddress = 0;
 
     Lowest = Highest = 0;
     CursorAddress = BufferAddress = 0;
 
     Lowest = Highest = 0;

diff --git a/usr/src/usr.bin/tn3270/general/globals.h b/usr/src/usr.bin/tn3270/general/globals.h
index 0daa87c..36486ae 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/globals.h
+++ b/usr/src/usr.bin/tn3270/general/globals.h
@@ -60,13 +60,6 @@ EXTERN int   OptWordWrap;
 #if    defined(INCLUDED_SCREEN)
 EXTERN ScreenImage
        Host[MAXSCREENSIZE];            /* host view of screen */
 #if    defined(INCLUDED_SCREEN)
 EXTERN ScreenImage
        Host[MAXSCREENSIZE];            /* host view of screen */

-#if    defined(SLOWSCREEN)
-EXTERN ScreenImage
-       Terminal[MAXSCREENSIZE];
-#endif /* defined(SLOWSCREEN) */
-
-EXTERN char    FieldForward[MAXSCREENSIZE],    /* non-zero for SF, 0..1919 */
-               FieldReverse[MAXSCREENSIZE];    /* non-zero for SF, 1919..0 */

 
 EXTERN char    Orders[256];                    /* Non-zero for orders */
 
 
 EXTERN char    Orders[256];                    /* Non-zero for orders */