change __TRACE to __CTRACE, so it doesn't collide with nvi

SCCS-vsn: lib/libcurses/addbytes.c 5.21
SCCS-vsn: lib/libcurses/clrtoeol.c 5.12
SCCS-vsn: lib/libcurses/cr_put.c 5.19
SCCS-vsn: lib/libcurses/curses.h 5.34
SCCS-vsn: lib/libcurses/deleteln.c 5.17
SCCS-vsn: lib/libcurses/erase.c 5.12
SCCS-vsn: lib/libcurses/getch.c 5.11
SCCS-vsn: lib/libcurses/initscr.c 5.15
SCCS-vsn: lib/libcurses/insertln.c 5.17
SCCS-vsn: lib/libcurses/move.c 5.13
SCCS-vsn: lib/libcurses/newwin.c 5.17
SCCS-vsn: lib/libcurses/overlay.c 5.13
SCCS-vsn: lib/libcurses/overwrite.c 5.14
SCCS-vsn: lib/libcurses/putchar.c 5.6
SCCS-vsn: lib/libcurses/refresh.c 5.43
SCCS-vsn: lib/libcurses/scroll.c 5.12
SCCS-vsn: lib/libcurses/setterm.c 5.19
SCCS-vsn: lib/libcurses/toucholap.c 5.11
SCCS-vsn: lib/libcurses/touchwin.c 5.12
SCCS-vsn: lib/libcurses/ctrace.c 5.5

diff --git a/usr/src/lib/libcurses/addbytes.c b/usr/src/lib/libcurses/addbytes.c
index 20b1d6b..15a13b4 100644 (file)
--- a/usr/src/lib/libcurses/addbytes.c
+++ b/usr/src/lib/libcurses/addbytes.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)addbytes.c 5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)addbytes.c 5.21 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -34,7 +34,7 @@ __waddbytes(win, bytes, count, so)
        SYNCH_IN;
 
 #ifdef DEBUG
        SYNCH_IN;
 
 #ifdef DEBUG

-       __TRACE("ADDBYTES('%c') at (%d, %d)\n", c, y, x);
+       __CTRACE("ADDBYTES('%c') at (%d, %d)\n", c, y, x);

 #endif
        while (count--) {
                c = *bytes++;
 #endif
        while (count--) {
                c = *bytes++;


@@ -48,7 +48,7 @@ __waddbytes(win, bytes, count, so)
 
                default:
 #ifdef DEBUG
 
                default:
 #ifdef DEBUG

-       __TRACE("ADDBYTES(%0.2o, %d, %d)\n", win, y, x);
+       __CTRACE("ADDBYTES(%0.2o, %d, %d)\n", win, y, x);

 #endif
                        
                        lp = win->lines[y];
 #endif
                        
                        lp = win->lines[y];


@@ -75,7 +75,7 @@ newline:                      if (y == win->maxy - 1) {
                        if (win->flags & __WSTANDOUT || so)
                                stand |= __STANDOUT;
 #ifdef DEBUG
                        if (win->flags & __WSTANDOUT || so)
                                stand |= __STANDOUT;
 #ifdef DEBUG

-       __TRACE("ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",
+       __CTRACE("ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",

            y, x, *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
                        if (lp->line[x].ch != c || 
            y, x, *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
                        if (lp->line[x].ch != c || 


@@ -90,7 +90,7 @@ newline:                      if (y == win->maxy - 1) {
                                else if (newx > *lp->lastchp)
                                        *lp->lastchp = newx;
 #ifdef DEBUG
                                else if (newx > *lp->lastchp)
                                        *lp->lastchp = newx;
 #ifdef DEBUG

-       __TRACE("ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
+       __CTRACE("ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",

            *lp->firstchp, *lp->lastchp,
            *lp->firstchp - win->ch_off,
            *lp->lastchp - win->ch_off);
            *lp->firstchp, *lp->lastchp,
            *lp->firstchp - win->ch_off,
            *lp->lastchp - win->ch_off);


@@ -106,7 +106,7 @@ newline:                    if (y == win->maxy - 1) {
                        else
                                x++;
 #ifdef DEBUG
                        else
                                x++;
 #ifdef DEBUG

-       __TRACE("ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",
+       __CTRACE("ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",

            y, x, *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
                        break;
            y, x, *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
                        break;

diff --git a/usr/src/lib/libcurses/clrtoeol.c b/usr/src/lib/libcurses/clrtoeol.c
index 27818ea..16b4943 100644 (file)
--- a/usr/src/lib/libcurses/clrtoeol.c
+++ b/usr/src/lib/libcurses/clrtoeol.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)clrtoeol.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)clrtoeol.c 5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -43,7 +43,7 @@ wclrtoeol(win)
                        sp->attr = 0;
                }
 #ifdef DEBUG
                        sp->attr = 0;
                }
 #ifdef DEBUG

-       __TRACE("CLRTOEOL: minx = %d, maxx = %d, firstch = %d, lastch = %d\n",
+       __CTRACE("CLRTOEOL: minx = %d, maxx = %d, firstch = %d, lastch = %d\n",

            minx, maxx - win->lines[y]->line, *win->lines[y]->firstchp, 
            *win->lines[y]->lastchp);
 #endif
            minx, maxx - win->lines[y]->line, *win->lines[y]->firstchp, 
            *win->lines[y]->lastchp);
 #endif

diff --git a/usr/src/lib/libcurses/cr_put.c b/usr/src/lib/libcurses/cr_put.c
index 4750fca..1620259 100644 (file)
--- a/usr/src/lib/libcurses/cr_put.c
+++ b/usr/src/lib/libcurses/cr_put.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cr_put.c   5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)cr_put.c   5.19 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -39,7 +39,7 @@ __mvcur(ly, lx, y, x, in_refresh)
        int ly, lx, y, x, in_refresh;
 {
 #ifdef DEBUG
        int ly, lx, y, x, in_refresh;
 {
 #ifdef DEBUG

-       __TRACE("mvcur: moving cursor from (%d, %d) to (%d, %d)\n",
+       __CTRACE("mvcur: moving cursor from (%d, %d) to (%d, %d)\n",

            ly, lx, y, x);
 #endif
        destcol = x;
            ly, lx, y, x);
 #endif
        destcol = x;

diff --git a/usr/src/lib/libcurses/ctrace.c b/usr/src/lib/libcurses/ctrace.c
index fcb46dd..419a2f4 100644 (file)
--- a/usr/src/lib/libcurses/ctrace.c
+++ b/usr/src/lib/libcurses/ctrace.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ctrace.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)ctrace.c   5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifdef DEBUG
 #endif /* not lint */
 
 #ifdef DEBUG


@@ -26,9 +26,9 @@ static FILE *tracefp;                 /* Curses debugging file descriptor. */
 
 void
 #if __STDC__
 
 void
 #if __STDC__

-__TRACE(const char *fmt, ...)
+__CTRACE(const char *fmt, ...)

 #else
 #else

-__TRACE(fmt, va_alist)
+__CTRACE(fmt, va_alist)

        char *fmt;
        va_dcl
 #endif
        char *fmt;
        va_dcl
 #endif

diff --git a/usr/src/lib/libcurses/curses.h b/usr/src/lib/libcurses/curses.h
index 9ef44a9..c6ae271 100644 (file)
--- a/usr/src/lib/libcurses/curses.h
+++ b/usr/src/lib/libcurses/curses.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)curses.h    5.33 (Berkeley) %G%
+ *     @(#)curses.h    5.34 (Berkeley) %G%

  */
 
 #ifndef _CURSES_H_
  */
 
 #ifndef _CURSES_H_


@@ -268,7 +268,7 @@ void         __cputchar __P((int));         /* Public: backward compatibility */
 
 #ifdef _CURSES_PRIVATE
 /* Private function prototypes. */
 
 #ifdef _CURSES_PRIVATE
 /* Private function prototypes. */

-void    __TRACE __P((const char *, ...));
+void    __CTRACE __P((const char *, ...));

 u_int   __hash __P((char *, int));
 void    __id_subwins __P((WINDOW *));
 int     __mvcur __P((int, int, int, int, int));
 u_int   __hash __P((char *, int));
 void    __id_subwins __P((WINDOW *));
 int     __mvcur __P((int, int, int, int, int));

diff --git a/usr/src/lib/libcurses/deleteln.c b/usr/src/lib/libcurses/deleteln.c
index 9dd6549..411de12 100644 (file)
--- a/usr/src/lib/libcurses/deleteln.c
+++ b/usr/src/lib/libcurses/deleteln.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)deleteln.c 5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)deleteln.c 5.17 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -24,7 +24,7 @@ wdeleteln(win)
        register __LINE *temp;
 
 #ifdef DEBUG
        register __LINE *temp;
 
 #ifdef DEBUG

-       __TRACE("deleteln: (%0.2o)\n", win);
+       __CTRACE("deleteln: (%0.2o)\n", win);

 #endif
        temp = win->lines[win->cury];
        for (y = win->cury; y < win->maxy - 1; y++) {
 #endif
        temp = win->lines[win->cury];
        for (y = win->cury; y < win->maxy - 1; y++) {

diff --git a/usr/src/lib/libcurses/erase.c b/usr/src/lib/libcurses/erase.c
index bbea099..bb012f8 100644 (file)
--- a/usr/src/lib/libcurses/erase.c
+++ b/usr/src/lib/libcurses/erase.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)erase.c    5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)erase.c    5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -24,7 +24,7 @@ werase(win)
        register __LDATA *sp, *end, *start, *maxx;
 
 #ifdef DEBUG
        register __LDATA *sp, *end, *start, *maxx;
 
 #ifdef DEBUG

-       __TRACE("werase: (%0.2o)\n", win);
+       __CTRACE("werase: (%0.2o)\n", win);

 #endif
        for (y = 0; y < win->maxy; y++) {
                minx = -1;
 #endif
        for (y = 0; y < win->maxy; y++) {
                minx = -1;

diff --git a/usr/src/lib/libcurses/getch.c b/usr/src/lib/libcurses/getch.c
index daa4d80..4ae44d7 100644 (file)
--- a/usr/src/lib/libcurses/getch.c
+++ b/usr/src/lib/libcurses/getch.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)getch.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)getch.c    5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -25,7 +25,7 @@ wgetch(win)
            && win->curx == win->maxx - 1 && win->cury == win->maxy - 1)
                return (ERR);
 #ifdef DEBUG
            && win->curx == win->maxx - 1 && win->cury == win->maxy - 1)
                return (ERR);
 #ifdef DEBUG

-       __TRACE("wgetch: __echoit = %d, __rawmode = %d\n",
+       __CTRACE("wgetch: __echoit = %d, __rawmode = %d\n",

            __echoit, __rawmode);
 #endif
        if (__echoit && !__rawmode) {
            __echoit, __rawmode);
 #endif
        if (__echoit && !__rawmode) {


@@ -36,7 +36,7 @@ wgetch(win)
 
        inp = getchar();
 #ifdef DEBUG
 
        inp = getchar();
 #ifdef DEBUG

-       __TRACE("wgetch got '%s'\n", unctrl(inp));
+       __CTRACE("wgetch got '%s'\n", unctrl(inp));

 #endif
        if (__echoit) {
                mvwaddch(curscr,
 #endif
        if (__echoit) {
                mvwaddch(curscr,

diff --git a/usr/src/lib/libcurses/initscr.c b/usr/src/lib/libcurses/initscr.c
index 38b05f0..0a18bfa 100644 (file)
--- a/usr/src/lib/libcurses/initscr.c
+++ b/usr/src/lib/libcurses/initscr.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)initscr.c  5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)initscr.c  5.15 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -23,7 +23,7 @@ initscr()
        register char *sp;
 
 #ifdef DEBUG
        register char *sp;
 
 #ifdef DEBUG

-       __TRACE("initscr\n");
+       __CTRACE("initscr\n");

 #endif
        __echoit = 1;
         __pfast = __rawmode = __noqch = 0;
 #endif
        __echoit = 1;
         __pfast = __rawmode = __noqch = 0;


@@ -60,7 +60,7 @@ initscr()
        (void)signal(SIGTSTP, __stop_signal_handler);
 
 #ifdef DEBUG
        (void)signal(SIGTSTP, __stop_signal_handler);
 
 #ifdef DEBUG

-       __TRACE("initscr: LINES = %d, COLS = %d\n", LINES, COLS);
+       __CTRACE("initscr: LINES = %d, COLS = %d\n", LINES, COLS);

 #endif
        __startwin();
 
 #endif
        __startwin();
 

diff --git a/usr/src/lib/libcurses/insertln.c b/usr/src/lib/libcurses/insertln.c
index 5173096..9938f37 100644 (file)
--- a/usr/src/lib/libcurses/insertln.c
+++ b/usr/src/lib/libcurses/insertln.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)insertln.c 5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)insertln.c 5.17 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -25,7 +25,7 @@ winsertln(win)
        register __LINE *temp;
 
 #ifdef DEBUG
        register __LINE *temp;
 
 #ifdef DEBUG

-       __TRACE("insertln: (%0.2o)\n", win);
+       __CTRACE("insertln: (%0.2o)\n", win);

 #endif
        if (win->orig == NULL)
                temp = win->lines[win->maxy - 1];
 #endif
        if (win->orig == NULL)
                temp = win->lines[win->maxy - 1];

diff --git a/usr/src/lib/libcurses/move.c b/usr/src/lib/libcurses/move.c
index 78f0032..d423d92 100644 (file)
--- a/usr/src/lib/libcurses/move.c
+++ b/usr/src/lib/libcurses/move.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)move.c     5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)move.c     5.13 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -22,7 +22,7 @@ wmove(win, y, x)
 {
 
 #ifdef DEBUG
 {
 
 #ifdef DEBUG

-       __TRACE("wmove: (%d, %d)\n", y, x);
+       __CTRACE("wmove: (%d, %d)\n", y, x);

 #endif
        if (x < 0 || y < 0)
                return (ERR);
 #endif
        if (x < 0 || y < 0)
                return (ERR);

diff --git a/usr/src/lib/libcurses/newwin.c b/usr/src/lib/libcurses/newwin.c
index e80804c..40df07d 100644 (file)
--- a/usr/src/lib/libcurses/newwin.c
+++ b/usr/src/lib/libcurses/newwin.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)newwin.c   5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)newwin.c   5.17 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -43,7 +43,7 @@ newwin(nl, nc, by, bx)
        win->ch_off = 0;
 
 #ifdef DEBUG
        win->ch_off = 0;
 
 #ifdef DEBUG

-       __TRACE("newwin: win->ch_off = %d\n", win->ch_off);
+       __CTRACE("newwin: win->ch_off = %d\n", win->ch_off);

 #endif
 
        for (lp = win->lines[0], i = 0; i < nl; i++, lp = win->lines[i]) {
 #endif
 
        for (lp = win->lines[0], i = 0; i < nl; i++, lp = win->lines[i]) {


@@ -66,7 +66,7 @@ subwin(orig, nl, nc, by, bx)
 
        /* Make sure window fits inside the original one. */
 #ifdef DEBUG
 
        /* Make sure window fits inside the original one. */
 #ifdef DEBUG

-       __TRACE("subwin: (%0.2o, %d, %d, %d, %d)\n", orig, nl, nc, by, bx);
+       __CTRACE("subwin: (%0.2o, %d, %d, %d, %d)\n", orig, nl, nc, by, bx);

 #endif
        if (by < orig->begy || bx < orig->begx
            || by + nl > orig->maxy + orig->begy
 #endif
        if (by < orig->begy || bx < orig->begx
            || by + nl > orig->maxy + orig->begy


@@ -108,7 +108,7 @@ __set_subwin(orig, win)
        }
 
 #ifdef DEBUG
        }
 
 #ifdef DEBUG

-       __TRACE("__set_subwin: win->ch_off = %d\n", win->ch_off);
+       __CTRACE("__set_subwin: win->ch_off = %d\n", win->ch_off);

 #endif
 }
 
 #endif
 }
 


@@ -127,12 +127,12 @@ __makenew(nl, nc, by, bx, sub)
        
 
 #ifdef DEBUG
        
 
 #ifdef DEBUG

-       __TRACE("makenew: (%d, %d, %d, %d)\n", nl, nc, by, bx);
+       __CTRACE("makenew: (%d, %d, %d, %d)\n", nl, nc, by, bx);

 #endif
        if ((win = malloc(sizeof(*win))) == NULL)
                return (NULL);
 #ifdef DEBUG
 #endif
        if ((win = malloc(sizeof(*win))) == NULL)
                return (NULL);
 #ifdef DEBUG

-       __TRACE("makenew: nl = %d\n", nl);
+       __CTRACE("makenew: nl = %d\n", nl);

 #endif
 
        /* 
 #endif
 
        /* 


@@ -175,7 +175,7 @@ __makenew(nl, nc, by, bx, sub)
                }
        }
 #ifdef DEBUG
                }
        }
 #ifdef DEBUG

-       __TRACE("makenew: nc = %d\n", nc);
+       __CTRACE("makenew: nc = %d\n", nc);

 #endif
        win->cury = win->curx = 0;
        win->maxy = nl;
 #endif
        win->cury = win->curx = 0;
        win->maxy = nl;


@@ -186,11 +186,11 @@ __makenew(nl, nc, by, bx, sub)
        win->flags = 0;
        __swflags(win);
 #ifdef DEBUG
        win->flags = 0;
        __swflags(win);
 #ifdef DEBUG

-       __TRACE("makenew: win->flags = %0.2o\n", win->flags);
-       __TRACE("makenew: win->maxy = %d\n", win->maxy);
-       __TRACE("makenew: win->maxx = %d\n", win->maxx);
-       __TRACE("makenew: win->begy = %d\n", win->begy);
-       __TRACE("makenew: win->begx = %d\n", win->begx);
+       __CTRACE("makenew: win->flags = %0.2o\n", win->flags);
+       __CTRACE("makenew: win->maxy = %d\n", win->maxy);
+       __CTRACE("makenew: win->maxx = %d\n", win->maxx);
+       __CTRACE("makenew: win->begy = %d\n", win->begy);
+       __CTRACE("makenew: win->begx = %d\n", win->begx);

 #endif
        return (win);
 }
 #endif
        return (win);
 }

diff --git a/usr/src/lib/libcurses/overlay.c b/usr/src/lib/libcurses/overlay.c
index a63aa57..de30f54 100644 (file)
--- a/usr/src/lib/libcurses/overlay.c
+++ b/usr/src/lib/libcurses/overlay.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)overlay.c  5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)overlay.c  5.13 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <ctype.h>
 #endif /* not lint */
 
 #include <ctype.h>


@@ -25,14 +25,14 @@ overlay(win1, win2)
        register __LDATA *sp, *end;
 
 #ifdef DEBUG
        register __LDATA *sp, *end;
 
 #ifdef DEBUG

-       __TRACE("overlay: (%0.2o, %0.2o);\n", win1, win2);
+       __CTRACE("overlay: (%0.2o, %0.2o);\n", win1, win2);

 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG
 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG

-       __TRACE("overlay: from (%d,%d) to (%d,%d)\n",
+       __CTRACE("overlay: from (%d,%d) to (%d,%d)\n",

            starty, startx, endy, endx);
 #endif
        if (starty >= endy || startx >= endx)
            starty, startx, endy, endx);
 #endif
        if (starty >= endy || startx >= endx)

diff --git a/usr/src/lib/libcurses/overwrite.c b/usr/src/lib/libcurses/overwrite.c
index 9369a86..04369b5 100644 (file)
--- a/usr/src/lib/libcurses/overwrite.c
+++ b/usr/src/lib/libcurses/overwrite.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)overwrite.c        5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)overwrite.c        5.14 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <ctype.h>
 #endif /* not lint */
 
 #include <ctype.h>


@@ -24,7 +24,7 @@ overwrite(win1, win2)
        register int x, y, endy, endx, starty, startx;
 
 #ifdef DEBUG
        register int x, y, endy, endx, starty, startx;
 
 #ifdef DEBUG

-       __TRACE("overwrite: (%0.2o, %0.2o);\n", win1, win2);
+       __CTRACE("overwrite: (%0.2o, %0.2o);\n", win1, win2);

 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);


@@ -33,7 +33,7 @@ overwrite(win1, win2)
        if (starty >= endy || startx >= endx)
                return (OK);
 #ifdef DEBUG
        if (starty >= endy || startx >= endx)
                return (OK);
 #ifdef DEBUG

-       __TRACE("overwrite: from (%d, %d) to (%d, %d)\n",
+       __CTRACE("overwrite: from (%d, %d) to (%d, %d)\n",

            starty, startx, endy, endx);
 #endif
        x = endx - startx;
            starty, startx, endy, endx);
 #endif
        x = endx - startx;

diff --git a/usr/src/lib/libcurses/putchar.c b/usr/src/lib/libcurses/putchar.c
index a149042..05f37a5 100644 (file)
--- a/usr/src/lib/libcurses/putchar.c
+++ b/usr/src/lib/libcurses/putchar.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)putchar.c  5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)putchar.c  5.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -17,7 +17,7 @@ __cputchar(ch)
 {
 
 #ifdef DEBUG
 {
 
 #ifdef DEBUG

-       __TRACE("__cputchar: %s\n", unctrl(ch));
+       __CTRACE("__cputchar: %s\n", unctrl(ch));

 #endif
        (void)putchar(ch);
 }
 #endif
        (void)putchar(ch);
 }

diff --git a/usr/src/lib/libcurses/refresh.c b/usr/src/lib/libcurses/refresh.c
index 1c10e7f..6f45191 100644 (file)
--- a/usr/src/lib/libcurses/refresh.c
+++ b/usr/src/lib/libcurses/refresh.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)refresh.c  5.42 (Berkeley) %G%";
+static char sccsid[] = "@(#)refresh.c  5.43 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -70,8 +70,8 @@ wrefresh(win)
                        werase(curscr);
        }
 #ifdef DEBUG
                        werase(curscr);
        }
 #ifdef DEBUG

-       __TRACE("wrefresh: (%0.2o): curwin = %d\n", win, curwin);
-       __TRACE("wrefresh: \tfirstch\tlastch\n");
+       __CTRACE("wrefresh: (%0.2o): curwin = %d\n", win, curwin);
+       __CTRACE("wrefresh: \tfirstch\tlastch\n");

 #endif
 
 #ifndef NOQCH
 #endif
 
 #ifndef NOQCH


@@ -90,36 +90,36 @@ wrefresh(win)
 
 #ifdef DEBUG
 { int i, j;
 
 #ifdef DEBUG
 { int i, j;

-               __TRACE("#####################################\n");
+               __CTRACE("#####################################\n");

                for (i = 0; i < curscr->maxy; i++) {
                for (i = 0; i < curscr->maxy; i++) {

-                       __TRACE("C: %d:", i);
-                       __TRACE(" 0x%x \n", curscr->lines[i]->hash);
+                       __CTRACE("C: %d:", i);
+                       __CTRACE(" 0x%x \n", curscr->lines[i]->hash);

                        for (j = 0; j < curscr->maxx; j++) 
                        for (j = 0; j < curscr->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   curscr->lines[i]->line[j].ch);
                                   curscr->lines[i]->line[j].ch);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                        for (j = 0; j < curscr->maxx; j++) 
                        for (j = 0; j < curscr->maxx; j++) 

-                               __TRACE("%x", 
+                               __CTRACE("%x", 

                                   curscr->lines[i]->line[j].attr);
                                   curscr->lines[i]->line[j].attr);

-                       __TRACE("\n");
-                       __TRACE("W: %d:", i);
-                       __TRACE(" 0x%x \n", win->lines[i]->hash);
-                       __TRACE(" 0x%x ", win->lines[i]->flags);
+                       __CTRACE("\n");
+                       __CTRACE("W: %d:", i);
+                       __CTRACE(" 0x%x \n", win->lines[i]->hash);
+                       __CTRACE(" 0x%x ", win->lines[i]->flags);

                        for (j = 0; j < win->maxx; j++) 
                        for (j = 0; j < win->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   win->lines[i]->line[j].ch);
                                   win->lines[i]->line[j].ch);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                        for (j = 0; j < win->maxx; j++) 
                        for (j = 0; j < win->maxx; j++) 

-                               __TRACE("%x", 
+                               __CTRACE("%x", 

                                   win->lines[i]->line[j].attr);
                                   win->lines[i]->line[j].attr);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                }
 }
 #endif /* DEBUG */
 
        for (wy = 0; wy < win->maxy; wy++) {
 #ifdef DEBUG
                }
 }
 #endif /* DEBUG */
 
        for (wy = 0; wy < win->maxy; wy++) {
 #ifdef DEBUG

-               __TRACE("%d\t%d\t%d\n",
+               __CTRACE("%d\t%d\t%d\n",

                    wy, *win->lines[wy]->firstchp, *win->lines[wy]->lastchp);
 #endif
                if (!curwin)
                    wy, *win->lines[wy]->firstchp, *win->lines[wy]->lastchp);
 #endif
                if (!curwin)


@@ -137,7 +137,7 @@ wrefresh(win)
                                if (*win->lines[wy]->lastchp < 
                                    *win->lines[wy]->firstchp) {
 #ifdef DEBUG
                                if (*win->lines[wy]->lastchp < 
                                    *win->lines[wy]->firstchp) {
 #ifdef DEBUG

-                                       __TRACE("wrefresh: line %d notdirty \n", wy);
+                                       __CTRACE("wrefresh: line %d notdirty \n", wy);

 #endif
                                        win->lines[wy]->flags &= ~__ISDIRTY;
                                }
 #endif
                                        win->lines[wy]->flags &= ~__ISDIRTY;
                                }


@@ -145,13 +145,13 @@ wrefresh(win)
 
                }
 #ifdef DEBUG
 
                }
 #ifdef DEBUG

-               __TRACE("\t%d\t%d\n", *win->lines[wy]->firstchp, 
+               __CTRACE("\t%d\t%d\n", *win->lines[wy]->firstchp, 

                        *win->lines[wy]->lastchp);
 #endif
        }
        
 #ifdef DEBUG
                        *win->lines[wy]->lastchp);
 #endif
        }
        
 #ifdef DEBUG

-       __TRACE("refresh: ly=%d, lx=%d\n", ly, lx);
+       __CTRACE("refresh: ly=%d, lx=%d\n", ly, lx);

 #endif
 
        if (win == curscr)
 #endif
 
        if (win == curscr)


@@ -260,7 +260,7 @@ makech(win, wy)
                domvcur(ly, lx, y, wx + win->begx);
 
 #ifdef DEBUG
                domvcur(ly, lx, y, wx + win->begx);
 
 #ifdef DEBUG

-               __TRACE("makech: 1: wx = %d, ly= %d, lx = %d, newy = %d, newx = %d, force =%d\n", 
+               __CTRACE("makech: 1: wx = %d, ly= %d, lx = %d, newy = %d, newx = %d, force =%d\n", 

                    wx, ly, lx, y, wx + win->begx, force);
 #endif
                ly = y;
                    wx, ly, lx, y, wx + win->begx, force);
 #endif
                ly = y;


@@ -278,13 +278,13 @@ makech(win, wy)
                                clsp = cep - curscr->lines[wy]->line - 
                                       win->begx * __LDATASIZE;
 #ifdef DEBUG
                                clsp = cep - curscr->lines[wy]->line - 
                                       win->begx * __LDATASIZE;
 #ifdef DEBUG

-                       __TRACE("makech: clsp = %d, nlsp = %d\n", clsp, nlsp);
+                       __CTRACE("makech: clsp = %d, nlsp = %d\n", clsp, nlsp);

 #endif
                                if ((clsp - nlsp >= strlen(CE) 
                                    && clsp < win->maxx * __LDATASIZE) ||
                                    wy == win->maxy - 1) {
 #ifdef DEBUG
 #endif
                                if ((clsp - nlsp >= strlen(CE) 
                                    && clsp < win->maxx * __LDATASIZE) ||
                                    wy == win->maxy - 1) {
 #ifdef DEBUG

-                                       __TRACE("makech: using CE\n");
+                                       __CTRACE("makech: using CE\n");

 #endif
                                        tputs(CE, 0, __cputchar);
                                        lx = wx + win->begx;
 #endif
                                        tputs(CE, 0, __cputchar);
                                        lx = wx + win->begx;


@@ -347,7 +347,7 @@ makech(win, wy)
                                        putchar(nsp->ch);
                        }
 #ifdef DEBUG
                                        putchar(nsp->ch);
                        }
 #ifdef DEBUG

-                       __TRACE("makech: putchar(%c)\n", nsp->ch & 0177);
+                       __CTRACE("makech: putchar(%c)\n", nsp->ch & 0177);

 #endif
                        if (UC && (nsp->attr & __STANDOUT)) {
                                putchar('\b');
 #endif
                        if (UC && (nsp->attr & __STANDOUT)) {
                                putchar('\b');


@@ -355,7 +355,7 @@ makech(win, wy)
                        }
                        nsp++;
 #ifdef DEBUG
                        }
                        nsp++;
 #ifdef DEBUG

-               __TRACE("makech: 2: wx = %d, lx = %d\n", wx, lx);
+               __CTRACE("makech: 2: wx = %d, lx = %d\n", wx, lx);

 #endif
                }
                if (lx == wx + win->begx)       /* If no change. */
 #endif
                }
                if (lx == wx + win->begx)       /* If no change. */


@@ -369,7 +369,7 @@ makech(win, wy)
                }
 
 #ifdef DEBUG
                }
 
 #ifdef DEBUG

-               __TRACE("makech: 3: wx = %d, lx = %d\n", wx, lx);
+               __CTRACE("makech: 3: wx = %d, lx = %d\n", wx, lx);

 #endif
        }
        return (OK);
 #endif
        }
        return (OK);


@@ -480,7 +480,7 @@ quickch(win)
                return;
 
 #ifdef DEBUG
                return;
 
 #ifdef DEBUG

-       __TRACE("quickch:bsize=%d,starts=%d,startw=%d,curw=%d,curs=%d,top=%d,bot=%d\n", 
+       __CTRACE("quickch:bsize=%d,starts=%d,startw=%d,curw=%d,curs=%d,top=%d,bot=%d\n", 

                bsize, starts, startw, curw, curs, top, bot);
 #endif
 
                bsize, starts, startw, curw, curs, top, bot);
 #endif
 


@@ -496,29 +496,29 @@ quickch(win)
        n = startw - starts;
 
 #ifdef DEBUG
        n = startw - starts;
 
 #ifdef DEBUG

-               __TRACE("#####################################\n");
+               __CTRACE("#####################################\n");

                for (i = 0; i < curscr->maxy; i++) {
                for (i = 0; i < curscr->maxy; i++) {

-                       __TRACE("C: %d:", i);
-                       __TRACE(" 0x%x \n", curscr->lines[i]->hash);
+                       __CTRACE("C: %d:", i);
+                       __CTRACE(" 0x%x \n", curscr->lines[i]->hash);

                        for (j = 0; j < curscr->maxx; j++) 
                        for (j = 0; j < curscr->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   curscr->lines[i]->line[j].ch);
                                   curscr->lines[i]->line[j].ch);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                        for (j = 0; j < curscr->maxx; j++) 
                        for (j = 0; j < curscr->maxx; j++) 

-                               __TRACE("%x", 
+                               __CTRACE("%x", 

                                   curscr->lines[i]->line[j].attr);
                                   curscr->lines[i]->line[j].attr);

-                       __TRACE("\n");
-                       __TRACE("W: %d:", i);
-                       __TRACE(" 0x%x \n", win->lines[i]->hash);
-                       __TRACE(" 0x%x ", win->lines[i]->flags);
+                       __CTRACE("\n");
+                       __CTRACE("W: %d:", i);
+                       __CTRACE(" 0x%x \n", win->lines[i]->hash);
+                       __CTRACE(" 0x%x ", win->lines[i]->flags);

                        for (j = 0; j < win->maxx; j++) 
                        for (j = 0; j < win->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   win->lines[i]->line[j].ch);
                                   win->lines[i]->line[j].ch);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                        for (j = 0; j < win->maxx; j++) 
                        for (j = 0; j < win->maxx; j++) 

-                               __TRACE("%x", 
+                               __CTRACE("%x", 

                                   win->lines[i]->line[j].attr);
                                   win->lines[i]->line[j].attr);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                }
 #endif 
        
                }
 #endif 
        


@@ -572,13 +572,13 @@ quickch(win)
                /* Mark block as clean and blank out scrolled lines. */
                clp = curscr->lines[target];
 #ifdef DEBUG
                /* Mark block as clean and blank out scrolled lines. */
                clp = curscr->lines[target];
 #ifdef DEBUG

-               __TRACE("quickch: n=%d startw=%d curw=%d i = %d target=%d ",
+               __CTRACE("quickch: n=%d startw=%d curw=%d i = %d target=%d ",

                        n, startw, curw, i, target);
 #endif
                if ((target >= startw && target < curw) || target < top 
                    || target > bot) {
 #ifdef DEBUG
                        n, startw, curw, i, target);
 #endif
                if ((target >= startw && target < curw) || target < top 
                    || target > bot) {
 #ifdef DEBUG

-                       __TRACE("-- notdirty");
+                       __CTRACE("-- notdirty");

 #endif
                        win->lines[target]->flags &= ~__ISDIRTY;
                } else if ((n > 0 && target >= top && target < top + n) ||
 #endif
                        win->lines[target]->flags &= ~__ISDIRTY;
                } else if ((n > 0 && target >= top && target < top + n) ||


@@ -588,24 +588,24 @@ quickch(win)
                                (void)memcpy(clp->line,  buf,
                                    win->maxx * __LDATASIZE);
 #ifdef DEBUG
                                (void)memcpy(clp->line,  buf,
                                    win->maxx * __LDATASIZE);
 #ifdef DEBUG

-                               __TRACE("-- blanked out: dirty");
+                               __CTRACE("-- blanked out: dirty");

 #endif
                                clp->hash = blank_hash;
                                __touchline(win, target, 0, win->maxx - 1, 0);
                        } else {
                                __touchline(win, target, 0, win->maxx - 1, 0);
 #ifdef DEBUG
 #endif
                                clp->hash = blank_hash;
                                __touchline(win, target, 0, win->maxx - 1, 0);
                        } else {
                                __touchline(win, target, 0, win->maxx - 1, 0);
 #ifdef DEBUG

-                               __TRACE(" -- blank line already: dirty");
+                               __CTRACE(" -- blank line already: dirty");

 #endif
                        }
                } else {
 #ifdef DEBUG
 #endif
                        }
                } else {
 #ifdef DEBUG

-                       __TRACE(" -- dirty");
+                       __CTRACE(" -- dirty");

 #endif
                        __touchline(win, target, 0, win->maxx - 1, 0);
                }
 #ifdef DEBUG
 #endif
                        __touchline(win, target, 0, win->maxx - 1, 0);
                }
 #ifdef DEBUG

-               __TRACE("\n");
+               __CTRACE("\n");

 #endif
                if (target == cur_period) {
                        i = target + 1;
 #endif
                if (target == cur_period) {
                        i = target + 1;


@@ -617,18 +617,18 @@ quickch(win)
                }
        }
 #ifdef DEBUG
                }
        }
 #ifdef DEBUG

-               __TRACE("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n");
+               __CTRACE("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n");

                for (i = 0; i < curscr->maxy; i++) {
                for (i = 0; i < curscr->maxy; i++) {

-                       __TRACE("C: %d:", i);
+                       __CTRACE("C: %d:", i);

                        for (j = 0; j < curscr->maxx; j++) 
                        for (j = 0; j < curscr->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   curscr->lines[i]->line[j].ch);
                                   curscr->lines[i]->line[j].ch);

-                       __TRACE("\n");
-                       __TRACE("W: %d:", i);
+                       __CTRACE("\n");
+                       __CTRACE("W: %d:", i);

                        for (j = 0; j < win->maxx; j++) 
                        for (j = 0; j < win->maxx; j++) 

-                               __TRACE("%c", 
+                               __CTRACE("%c", 

                                   win->lines[i]->line[j].ch);
                                   win->lines[i]->line[j].ch);

-                       __TRACE("\n");
+                       __CTRACE("\n");

                }
 #endif
        if (n != 0)
                }
 #endif
        if (n != 0)

diff --git a/usr/src/lib/libcurses/scroll.c b/usr/src/lib/libcurses/scroll.c
index 3b3e7b1..e3fb517 100644 (file)
--- a/usr/src/lib/libcurses/scroll.c
+++ b/usr/src/lib/libcurses/scroll.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)scroll.c   5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)scroll.c   5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -23,7 +23,7 @@ scroll(win)
        register int oy, ox;
 
 #ifdef DEBUG
        register int oy, ox;
 
 #ifdef DEBUG

-       __TRACE("scroll: (%0.2o)\n", win);
+       __CTRACE("scroll: (%0.2o)\n", win);

 #endif
 
        if (!(win->flags & __SCROLLOK))
 #endif
 
        if (!(win->flags & __SCROLLOK))


@@ -39,7 +39,7 @@ scroll(win)
                if (__orig_termios.c_oflag & ONLCR)
                        win->curx = 0;
 #ifdef DEBUG
                if (__orig_termios.c_oflag & ONLCR)
                        win->curx = 0;
 #ifdef DEBUG

-               __TRACE("scroll: win == curscr\n");
+               __CTRACE("scroll: win == curscr\n");

 #endif
        }
        return (OK);
 #endif
        }
        return (OK);

diff --git a/usr/src/lib/libcurses/setterm.c b/usr/src/lib/libcurses/setterm.c
index d0f7e60..60017a6 100644 (file)
--- a/usr/src/lib/libcurses/setterm.c
+++ b/usr/src/lib/libcurses/setterm.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)setterm.c  5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)setterm.c  5.19 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/ioctl.h>
 #endif /* not lint */
 
 #include <sys/ioctl.h>


@@ -63,7 +63,7 @@ setterm(type)
        char *p;
 
 #ifdef DEBUG
        char *p;
 
 #ifdef DEBUG

-       __TRACE("setterm: (\"%s\")\nLINES = %d, COLS = %d\n",
+       __CTRACE("setterm: (\"%s\")\nLINES = %d, COLS = %d\n",

            type, LINES, COLS);
 #endif
        if (type[0] == '\0')
            type, LINES, COLS);
 #endif
        if (type[0] == '\0')


@@ -74,7 +74,7 @@ setterm(type)
                strcpy(genbuf, "xx|dumb:");
        }
 #ifdef DEBUG
                strcpy(genbuf, "xx|dumb:");
        }
 #ifdef DEBUG

-       __TRACE("setterm: tty = %s\n", type);
+       __CTRACE("setterm: tty = %s\n", type);

 #endif
 
        /* Try TIOCGWINSZ, and, if it fails, the termcap entry. */
 #endif
 
        /* Try TIOCGWINSZ, and, if it fails, the termcap entry. */


@@ -100,7 +100,7 @@ setterm(type)
                return (ERR);
 
 #ifdef DEBUG
                return (ERR);
 
 #ifdef DEBUG

-       __TRACE("setterm: LINES = %d, COLS = %d\n", LINES, COLS);
+       __CTRACE("setterm: LINES = %d, COLS = %d\n", LINES, COLS);

 #endif
        aoftspace = tspace;
        zap();                  /* Get terminal description. */
 #endif
        aoftspace = tspace;
        zap();                  /* Get terminal description. */


@@ -154,7 +154,7 @@ zap()
                *(tmp + 1) = *(namp + 1);
                *(*fp++) = tgetflag(tmp);
 #ifdef DEBUG
                *(tmp + 1) = *(namp + 1);
                *(*fp++) = tgetflag(tmp);
 #ifdef DEBUG

-               __TRACE("2.2s = %s\n", namp, *fp[-1] ? "TRUE" : "FALSE");
+               __CTRACE("2.2s = %s\n", namp, *fp[-1] ? "TRUE" : "FALSE");

 #endif
                namp += 2;
                
 #endif
                namp += 2;
                


@@ -166,11 +166,11 @@ zap()
                *(tmp + 1) = *(namp + 1);
                *(*sp++) = tgetstr(tmp, &aoftspace);
 #ifdef DEBUG
                *(tmp + 1) = *(namp + 1);
                *(*sp++) = tgetstr(tmp, &aoftspace);
 #ifdef DEBUG

-               __TRACE("2.2s = %s", namp, *sp[-1] == NULL ? "NULL\n" : "\"");
+               __CTRACE("2.2s = %s", namp, *sp[-1] == NULL ? "NULL\n" : "\"");

                if (*sp[-1] != NULL) {
                        for (cp = *sp[-1]; *cp; cp++)
                if (*sp[-1] != NULL) {
                        for (cp = *sp[-1]; *cp; cp++)

-                               __TRACE("%s", unctrl(*cp));
-                       __TRACE("\"\n");
+                               __CTRACE("%s", unctrl(*cp));
+                       __CTRACE("\"\n");

                }
 #endif
                namp += 2;
                }
 #endif
                namp += 2;

diff --git a/usr/src/lib/libcurses/toucholap.c b/usr/src/lib/libcurses/toucholap.c
index be95d83..beab43e 100644 (file)
--- a/usr/src/lib/libcurses/toucholap.c
+++ b/usr/src/lib/libcurses/toucholap.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)toucholap.c        5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)toucholap.c        5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -22,19 +22,19 @@ touchoverlap(win1, win2)
        register int y, endy, endx, starty, startx;
 
 #ifdef DEBUG
        register int y, endy, endx, starty, startx;
 
 #ifdef DEBUG

-       __TRACE("touchoverlap: (%0.2o, %0.2o);\n", win1, win2);
+       __CTRACE("touchoverlap: (%0.2o, %0.2o);\n", win1, win2);

 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG
 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG

-       __TRACE("touchoverlap: from (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: from (%d,%d) to (%d,%d)\n",

            starty, startx, endy, endx);
            starty, startx, endy, endx);

-       __TRACE("touchoverlap: win1 (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: win1 (%d,%d) to (%d,%d)\n",

            win1->begy, win1->begx, win1->begy + win1->maxy,
            win1->begx + win1->maxx);
            win1->begy, win1->begx, win1->begy + win1->maxy,
            win1->begx + win1->maxx);

-       __TRACE("touchoverlap: win2 (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: win2 (%d,%d) to (%d,%d)\n",

            win2->begy, win2->begx, win2->begy + win2->maxy,
            win2->begx + win2->maxx);
 #endif
            win2->begy, win2->begx, win2->begy + win2->maxy,
            win2->begx + win2->maxx);
 #endif

diff --git a/usr/src/lib/libcurses/touchwin.c b/usr/src/lib/libcurses/touchwin.c
index d4ef348..4eba0b0 100644 (file)
--- a/usr/src/lib/libcurses/touchwin.c
+++ b/usr/src/lib/libcurses/touchwin.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)touchwin.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)touchwin.c 5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -36,7 +36,7 @@ touchwin(win)
        register int y, maxy;
 
 #ifdef DEBUG
        register int y, maxy;
 
 #ifdef DEBUG

-       __TRACE("touchwin: (%0.2o)\n", win);
+       __CTRACE("touchwin: (%0.2o)\n", win);

 #endif
        maxy = win->maxy;
        for (y = 0; y < maxy; y++)
 #endif
        maxy = win->maxy;
        for (y = 0; y < maxy; y++)


@@ -52,7 +52,7 @@ __touchwin(win)
        register int y, maxy;
 
 #ifdef DEBUG
        register int y, maxy;
 
 #ifdef DEBUG

-       __TRACE("touchwin: (%0.2o)\n", win);
+       __CTRACE("touchwin: (%0.2o)\n", win);

 #endif
        maxy = win->maxy;
        for (y = 0; y < maxy; y++)
 #endif
        maxy = win->maxy;
        for (y = 0; y < maxy; y++)


@@ -67,8 +67,8 @@ __touchline(win, y, sx, ex, force)
        int force;
 {
 #ifdef DEBUG
        int force;
 {
 #ifdef DEBUG

-       __TRACE("touchline: (%0.2o, %d, %d, %d, %d)\n", win, y, sx, ex, force);
-       __TRACE("touchline: first = %d, last = %d\n",
+       __CTRACE("touchline: (%0.2o, %d, %d, %d, %d)\n", win, y, sx, ex, force);
+       __CTRACE("touchline: first = %d, last = %d\n",

            *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
        if (force)
            *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
        if (force)


@@ -86,7 +86,7 @@ __touchline(win, y, sx, ex, force)
                        *win->lines[y]->lastchp = ex;
        }
 #ifdef DEBUG
                        *win->lines[y]->lastchp = ex;
        }
 #ifdef DEBUG

-       __TRACE("touchline: first = %d, last = %d\n",
+       __CTRACE("touchline: first = %d, last = %d\n",

            *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
        return (OK);
            *win->lines[y]->firstchp, *win->lines[y]->lastchp);
 #endif
        return (OK);