ncurses 6.2 - patch 20200816

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

diff --git a/ncurses/base/lib_slklab.c b/ncurses/base/lib_slklab.c
index 03039ad696cae1c46a8a95308a0eeb6e1105ee2f..894ff26dbd30e67011127094161656feebd89898 100644 (file)
--- a/ncurses/base/lib_slklab.c
+++ b/ncurses/base/lib_slklab.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -29,6 +30,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and:  Juergen Pfeifer,                       1998,2009               *
+ *     and:  Thomas E. Dickey                       1998-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -38,14 +41,22 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slklab.c,v 1.4 1998/02/11 12:13:54 tom Exp $")
+MODULE_ID("$Id: lib_slklab.c,v 1.11 2020/02/02 23:34:34 tom Exp $")

 
 

-char*
-slk_label(int n)
+NCURSES_EXPORT(char *)
+NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)

 {
 {

-       T((T_CALLED("slk_label(%d)"), n));
+    T((T_CALLED("slk_label(%p,%d)"), (void *) SP_PARM, n));
+
+    if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt)
+       returnPtr(0);
+    returnPtr(SP_PARM->_slk->ent[n - 1].ent_text);
+}

 
 

-       if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt)
-               returnPtr(0);
-       returnPtr(SP->_slk->ent[n-1].text);
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char *)
+slk_label(int n)
+{
+    return NCURSES_SP_NAME(slk_label) (CURRENT_SCREEN, n);

 }
 }

+#endif