X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fsp_tinfo.c;h=a3e5c55323c49ca3c56fcbc180e7919629bee613;hp=8e42ad32fdd508557d3962bb37f1d54bca8e219c;hb=2017ab0e60ca857accae38a01252e0cbdf5f1efe;hpb=3eda6f30a84d53844d2ebceadb457e2e7e9cfbf3

diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c
index 8e42ad32..a3e5c553 100644
--- a/test/sp_tinfo.c
+++ b/test/sp_tinfo.c
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /*
- * $Id: sp_tinfo.c,v 1.17 2017/04/02 01:03:30 tom Exp $
+ * $Id: sp_tinfo.c,v 1.21 2017/06/17 21:19:25 tom Exp $
  *
  * TOTO: add option for non-sp-funcs interface
  */
@@ -74,14 +74,14 @@ initialize(const char *name, FILE *output)
     result->fp = output;
     result->name = name;
     result->outc = (fileno(output) == 1) ? my_outc : my_errc;
-    result->sp = opt_n ? 0 : new_prescr();
+    result->sp = opt_n ? NULL : new_prescr();
 
     if (opt_t) {
 	char *temp = strdup(name);
 	tgetent_sp(result->sp, temp, name);
 	free(temp);
     } else {
-	setupterm(name, fileno(output), &error);
+	setupterm((NCURSES_CONST char *) name, fileno(output), &error);
     }
     result->term = cur_term;
 
@@ -100,13 +100,16 @@ show_flag(MYDATA * data, const char *name, int value)
     }
 }
 
+#define TC_PARMS data->sp, (NCURSES_CONST char *)tc
+#define TI_PARMS data->sp, (NCURSES_CONST char *)ti
+
 static void
 show_cap_flag(MYDATA * data, const char *ti, const char *tc)
 {
     const char *name = (opt_t ? tc : ti);
     show_flag(data, name, (opt_t
-			   ? tgetflag_sp(data->sp, tc)
-			   : tigetflag_sp(data->sp, ti)));
+			   ? tgetflag_sp(TC_PARMS)
+			   : tigetflag_sp(TI_PARMS)));
 }
 
 static void
@@ -126,8 +129,8 @@ show_cap_number(MYDATA * data, const char *ti, const char *tc)
 {
     const char *name = (opt_t ? tc : ti);
     show_number(data, name, (opt_t
-			     ? tgetnum_sp(data->sp, tc)
-			     : tigetnum_sp(data->sp, ti)));
+			     ? tgetnum_sp(TC_PARMS)
+			     : tigetnum_sp(TI_PARMS)));
 }
 
 static void
@@ -162,8 +165,8 @@ show_cap_string(MYDATA * data, const char *ti, const char *tc)
     char tcapjunk[1024];
     char *tcap_ptr = tcapjunk;
     show_string(data, name, (opt_t
-			     ? tgetstr_sp(data->sp, tc, &tcap_ptr)
-			     : tigetstr_sp(data->sp, ti)));
+			     ? tgetstr_sp(TC_PARMS, &tcap_ptr)
+			     : tigetstr_sp(TI_PARMS)));
 }
 
 static void
@@ -267,7 +270,9 @@ cleanup(MYDATA * data)
 {
     set_curterm(data->term);
     del_curterm(data->term);
+#if !NO_LEAKS
     free(data->sp);		/* cannot use delscreen in tinfo */
+#endif
     free(data);
 }