X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_slk.c;h=8fafdbca83832530aa11f347106bd107e58f6aaf;hp=d0407cec483d749d227a92956b05017ed6983185;hb=92e187a3459ab7ce1613a3684ca6642447c73620;hpb=bbb7fd37298f7d81386a4cf868417b9e084d7d90

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index d0407cec..8fafdbca 100644
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,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            *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slk.c,v 1.42 2009/08/15 23:05:02 tom Exp $")
+MODULE_ID("$Id: lib_slk.c,v 1.45 2010/05/01 20:44:34 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -140,7 +140,6 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
     int res = OK;
     unsigned max_length;
     SCREEN *sp;
-    TERMINAL *term;
     int numlab;
 
     T((T_CALLED("_nc_slk_initialize()")));
@@ -151,8 +150,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
     if (0 == sp)
 	returnCode(ERR);
 
-    term = TerminalOf(SP_PARM);
-    assert(term);
+    assert(TerminalOf(SP_PARM));
 
     numlab = NumLabels;
 
@@ -161,8 +159,6 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
     } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == 0)
 	returnCode(ERR);
 
-    SP_PARM->_slk->hidden = TRUE;
-    SP_PARM->_slk->ent = NULL;
     if (!SP_PARM->slk_format)
 	SP_PARM->slk_format = _nc_globals.slk_format;
 
@@ -231,7 +227,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("slk_restore(%p)"), SP_PARM));
+    T((T_CALLED("slk_restore(%p)"), (void *) SP_PARM));
 
     if (0 == SP_PARM)
 	returnCode(ERR);