aboutsummaryrefslogtreecommitdiff
path: root/ncurses/tinfo/lib_longname.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/tinfo/lib_longname.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/tinfo/lib_longname.c')
-rw-r--r--ncurses/tinfo/lib_longname.c42
1 files changed, 4 insertions, 38 deletions
diff --git a/ncurses/tinfo/lib_longname.c b/ncurses/tinfo/lib_longname.c
index 14903175b322..1301ee516944 100644
--- a/ncurses/tinfo/lib_longname.c
+++ b/ncurses/tinfo/lib_longname.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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 *
@@ -29,8 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Thomas E. Dickey 1996-on *
- * and: Juergen Pfeifer 2009 *
****************************************************************************/
/*
@@ -42,38 +40,8 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_longname.c,v 1.12 2010/12/20 00:31:26 tom Exp $")
+MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $")
-#if USE_REENTRANT
-NCURSES_EXPORT(char *)
-NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0)
-{
- static char empty[] =
- {'\0'};
- char *ptr;
-
- T((T_CALLED("longname(%p)"), (void *) SP_PARM));
-
- if (SP_PARM) {
- for (ptr = SP_PARM->_ttytype + strlen(SP_PARM->_ttytype);
- ptr > SP_PARM->_ttytype;
- ptr--)
- if (*ptr == '|')
- returnPtr(ptr + 1);
- returnPtr(SP_PARM->_ttytype);
- }
- return empty;
-}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(char *)
-longname(void)
-{
- return NCURSES_SP_NAME(longname) (CURRENT_SCREEN);
-}
-#endif
-
-#else
NCURSES_EXPORT(char *)
longname(void)
{
@@ -81,11 +49,9 @@ longname(void)
T((T_CALLED("longname()")));
- for (ptr = ttytype + strlen(ttytype);
- ptr > ttytype;
- ptr--)
+ for (ptr = ttytype + strlen(ttytype); ptr > ttytype; ptr--)
if (*ptr == '|')
returnPtr(ptr + 1);
+
returnPtr(ttytype);
}
-#endif