/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2011 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 *
#include <curses.priv.h>
-MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.15 2011/05/28 22:52:06 tom Exp $")
#include <fifo_defs.h>
#endif /* TRACE */
NCURSES_EXPORT(int)
-_nc_ungetch(SCREEN *sp, int ch)
+safe_ungetch(SCREEN *sp, int ch)
{
int rc = ERR;
- if (tail != -1) {
+ T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+
+ if (sp != 0 && tail != -1) {
if (head == -1) {
head = 0;
t_inc();
#endif
rc = OK;
}
- return rc;
-}
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch)
-{
- T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch)));
- returnCode(_nc_ungetch(SP_PARM, ch));
+ returnCode(rc);
}
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(int)
ungetch(int ch)
{
- return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch);
+ return safe_ungetch(CURRENT_SCREEN, ch);
}
-#endif