X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fuse_window.c;h=4893053bd1554ec74e27d8541cf4a2c0d7ca4799;hp=5ef07c8288d1741e5020d76aad0233495282fb91;hb=2db461ea0b1b29c142e3000d830b520c946e385b;hpb=aabbbcb7892fd946828a4170378b13b9d12435c6 diff --git a/ncurses/base/use_window.c b/ncurses/base/use_window.c index 5ef07c82..4893053b 100644 --- a/ncurses/base/use_window.c +++ b/ncurses/base/use_window.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2007 Free Software Foundation, Inc. * + * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2007-2009,2016 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 * @@ -32,16 +33,22 @@ #include -MODULE_ID("$Id: use_window.c,v 1.1 2007/09/08 21:35:33 tom Exp $") +MODULE_ID("$Id: use_window.c,v 1.13 2020/02/02 23:34:34 tom Exp $") NCURSES_EXPORT(int) -use_window(WINDOW *win, NCURSES_CALLBACK func, void *data) +use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data) { int code = OK; + TR_FUNC_BFR(1); - T((T_CALLED("use_window(%p,%p,%p)"), win, func, data)); - _nc_lock_window(win); + T((T_CALLED("use_window(%p,%s,%p)"), + (void *) win, + TR_FUNC_ARG(0, func), + data)); + + _nc_lock_global(curses); code = func(win, data); - _nc_unlock_window(win); + _nc_unlock_global(curses); + returnCode(code); }