ncurses 5.7 - patch 20101204

[ncurses.git] / ncurses / tinfo / use_screen.c

diff --git a/ncurses/tinfo/use_screen.c b/ncurses/tinfo/use_screen.c
index a4f34c0e45205430e8f1a8cda4963bc449147644..6a0297cebd5181fa6819ea76c72b0f0b54eb3bd9 100644 (file)
--- a/ncurses/tinfo/use_screen.c
+++ b/ncurses/tinfo/use_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2007-2008,2009 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            *


@@ -32,7 +32,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: use_screen.c,v 1.4 2008/03/29 21:19:58 tom Exp $")
+MODULE_ID("$Id: use_screen.c,v 1.8 2009/10/24 22:40:20 tom Exp $")

 
 NCURSES_EXPORT(int)
 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
 
 NCURSES_EXPORT(int)
 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)


@@ -40,21 +40,19 @@ use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
     SCREEN *save_SP;
     int code = OK;
 
     SCREEN *save_SP;
     int code = OK;
 

-    T((T_CALLED("use_screen(%p,%p,%p)"), screen, func, data));
+    T((T_CALLED("use_screen(%p,%p,%p)"), (void *) screen, func, (void *) data));

 
     /*
      * FIXME - add a flag so a given thread can check if _it_ has already
      * recurred through this point, return an error if so.
      */
 
     /*
      * FIXME - add a flag so a given thread can check if _it_ has already
      * recurred through this point, return an error if so.
      */

-    _nc_lock_global(use_screen);
-    save_SP = SP;
+    _nc_lock_global(curses);
+    save_SP = CURRENT_SCREEN;

     set_term(screen);
 
     code = func(screen, data);
 
     set_term(save_SP);
     set_term(screen);
 
     code = func(screen, data);
 
     set_term(save_SP);

-    _nc_unlock_global(use_screen);
+    _nc_unlock_global(curses);

     returnCode(code);
     returnCode(code);

-
-    return 0;

 }
 }