ncurses 5.6 - patch 20070612

[ncurses.git] / ncurses / tty / hashmap.c

diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 7ff356b645502719e5d75f61ad2d4914a2649a81..3426ee3272448d705e708b002203a5fa56426926 100644 (file)
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2006,2007 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -70,7 +70,7 @@ AUTHOR
 #include <curses.priv.h>
 #include <term.h>              /* for back_color_erase */
 
 #include <curses.priv.h>
 #include <term.h>              /* for back_color_erase */
 

-MODULE_ID("$Id: hashmap.c,v 1.50 2006/12/30 22:19:58 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.52 2007/05/05 21:50:48 tom Exp $")

 
 #ifdef HASHDEBUG
 
 
 #ifdef HASHDEBUG
 


@@ -87,6 +87,8 @@ static chtype oldtext[MAXLINES][TEXTWIDTH], newtext[MAXLINES][TEXTWIDTH];
 # define NEWTEXT(m)    newtext[m]
 # define PENDING(n)     1
 
 # define NEWTEXT(m)    newtext[m]
 # define PENDING(n)     1
 

+extern NCURSES_EXPORT_VAR(unsigned)     _nc_tracing;
+

 #else /* !HASHDEBUG */
 
 # define OLDNUM(n)     SP->_oldnum_list[n]
 #else /* !HASHDEBUG */
 
 # define OLDNUM(n)     SP->_oldnum_list[n]


@@ -446,7 +448,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     char line[BUFSIZ], *st;
     int n;
 
     char line[BUFSIZ], *st;
     int n;
 

-    SP = typeCalloc(SCREEN, 1);
+    if (!_nc_alloc_screen())
+       return EXIT_FAILURE;
+

     for (n = 0; n < screen_lines; n++) {
        reallines[n] = n;
        oldnums[n] = _NEWINDEX;
     for (n = 0; n < screen_lines; n++) {
        reallines[n] = n;
        oldnums[n] = _NEWINDEX;