ncurses 6.2 - patch 20200829

[ncurses.git] / ncurses / base / lib_slkinit.c

diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c
index e7fa1221eb02819ec6a2648e0545eba4714767d0..e1602abc9f18855e4f42e20c5248d887bc556169 100644 (file)
--- a/ncurses/base/lib_slkinit.c
+++ b/ncurses/base/lib_slkinit.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2017 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            *


@@ -40,7 +41,7 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkinit.c,v 1.11 2009/05/23 23:32:57 tom Exp $")
+MODULE_ID("$Id: lib_slkinit.c,v 1.15 2020/02/02 23:34:34 tom Exp $")

 
 #ifdef USE_SP_RIPOFF
 #define SoftkeyFormat SP_PARM->slk_format
 
 #ifdef USE_SP_RIPOFF
 #define SoftkeyFormat SP_PARM->slk_format


@@ -53,7 +54,8 @@ NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
 {
     int code = ERR;
 
 {
     int code = ERR;
 

-    T((T_CALLED("slk_init(%p,%d)"), SP_PARM, format));
+    START_TRACE();
+    T((T_CALLED("slk_init(%p,%d)"), (void *) SP_PARM, format));

 
     if (format >= 0
        && format <= 3
 
     if (format >= 0
        && format <= 3


@@ -74,6 +76,11 @@ NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
 NCURSES_EXPORT(int)
 slk_init(int format)
 {
 NCURSES_EXPORT(int)
 slk_init(int format)
 {

-    return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN_PRE, format);
+    int rc;
+    _nc_lock_global(prescreen);
+    START_TRACE();
+    rc = NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN_PRE, format);
+    _nc_unlock_global(prescreen);
+    return rc;

 }
 #endif
 }
 #endif