X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Flib_vidattr.c;h=5d23e95651825506536cd2762d8d5b0bea69d642;hp=88f1e1a246656134ad30cd55b28d28a666e0f853;hb=11dead39816318fe9601e27756b9497caf7ff490;hpb=3ce2c58251fe1353768cc630103cdb12ecc8be0a

diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 88f1e1a2..5d23e956 100644
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -69,7 +69,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vidattr.c,v 1.57 2009/05/23 20:46:28 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.60 2010/03/31 23:38:02 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -84,7 +84,7 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.57 2009/05/23 20:46:28 tom Exp $")
 	/* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why,old_attr) \
 	if (can_color && (why)) { \
-		int old_pair = PAIR_NUMBER(old_attr); \
+		int old_pair = PairNumber(old_attr); \
 		TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, pair)); \
 		if ((pair != old_pair) \
 		 || (fix_pair0 && (pair == 0)) \
@@ -113,7 +113,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 
     newmode &= A_ATTRIBUTES;
 
-    T((T_CALLED("vidputs(%p,%s)"), SP_PARM, _traceattr(newmode)));
+    T((T_CALLED("vidputs(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
 
     if (!IsTermInfo(SP_PARM))
 	returnCode(ERR);
@@ -201,7 +201,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
     if (newmode == PreviousAttr)
 	returnCode(OK);
 
-    pair = PAIR_NUMBER(newmode);
+    pair = PairNumber(newmode);
 
     if (reverse) {
 	newmode &= ~A_REVERSE;
@@ -319,7 +319,7 @@ vidputs(chtype newmode, NCURSES_OUTC outc)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode)
 {
-    T((T_CALLED("vidattr(%p,%s)"), SP_PARM, _traceattr(newmode)));
+    T((T_CALLED("vidattr(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
     returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx
 					 newmode,
 					 NCURSES_SP_NAME(_nc_outch)));
@@ -338,13 +338,12 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
 {
     chtype attrs = A_NORMAL;
 
-    T((T_CALLED("termattrs(%p)"), SP_PARM));
+    T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));
 #ifdef USE_TERM_DRIVER
     if (HasTerminal(SP_PARM))
 	attrs = CallDriver(SP_PARM, conattr);
 #else
 
-    T((T_CALLED("termattrs()")));
     if (enter_alt_charset_mode)
 	attrs |= A_ALTCHARSET;