aboutsummaryrefslogtreecommitdiff
path: root/ncurses/widechar/lib_unget_wch.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/widechar/lib_unget_wch.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/widechar/lib_unget_wch.c')
-rw-r--r--ncurses/widechar/lib_unget_wch.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index 7a626a9eee84..bb2c4a084b15 100644
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2002-2007,2008 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 *
@@ -39,7 +39,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_unget_wch.c,v 1.14 2010/07/24 11:35:21 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.10 2008/06/07 14:50:37 tom Exp $")
/*
* Wrapper for wcrtomb() which obtains the length needed for the given
@@ -55,24 +55,24 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
const wchar_t *tempp = temp;
temp[0] = source;
temp[1] = 0;
- result = (int) wcsrtombs(NULL, &tempp, 0, state);
+ result = wcsrtombs(NULL, &tempp, 0, state);
} else {
- result = (int) wcrtomb(target, source, state);
+ result = wcrtomb(target, source, state);
}
if (!isEILSEQ(result) && (result == 0))
result = 1;
- return (size_t) result;
+ return result;
}
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
+unget_wch(const wchar_t wch)
{
int result = OK;
mbstate_t state;
size_t length;
int n;
- T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
+ T((T_CALLED("unget_wch(%#lx)"), (unsigned long) wch));
init_mb(state);
length = _nc_wcrtomb(0, wch, &state);
@@ -83,12 +83,10 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
if ((string = (char *) malloc(length)) != 0) {
init_mb(state);
- /* ignore the result, since we already validated the character */
- IGNORE_RC((int) wcrtomb(string, wch, &state));
+ wcrtomb(string, wch, &state);
for (n = (int) (length - 1); n >= 0; --n) {
- if (NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx
- UChar(string[n])) !=OK) {
+ if (_nc_ungetch(SP, string[n]) != OK) {
result = ERR;
break;
}
@@ -103,11 +101,3 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
returnCode(result);
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-unget_wch(const wchar_t wch)
-{
- return NCURSES_SP_NAME(unget_wch) (CURRENT_SCREEN, wch);
-}
-#endif