diff options
| author |   nicm <nicm@openbsd.org> | 2010-01-12 23:21:58 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-01-12 23:21:58 +0000 |
| commit | 81d8c4e1e65ef590376b5b08744af794c42bd575 (patch) | |
| tree | 7699ed6e10b41563ce3a6734235390cce070489c /lib/libmenu/m_pad.c | |
| parent | save errno wrapping in a signal handler (diff) | |
| download | wireguard-openbsd-81d8c4e1e65ef590376b5b08744af794c42bd575.tar.xz wireguard-openbsd-81d8c4e1e65ef590376b5b08744af794c42bd575.zip | |
Update to ncurses 5.7, with local changes reapplied.
This is around eight years worth of changes (previously we were around ncurses
5.2), too many to list - many bug fixes and also a few new functions.
A major bump for libcurses, libpanel, libform and libmenu.
ok deraadt
Diffstat (limited to 'lib/libmenu/m_pad.c')
| -rw-r--r-- | lib/libmenu/m_pad.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/libmenu/m_pad.c b/lib/libmenu/m_pad.c index 78122817642..4ea8d09fdf8 100644 --- a/lib/libmenu/m_pad.c +++ b/lib/libmenu/m_pad.c @@ -1,7 +1,7 @@ -/* $OpenBSD: m_pad.c,v 1.4 2001/01/22 18:02:05 millert Exp $ */ +/* $OpenBSD: m_pad.c,v 1.5 2010/01/12 23:22:08 nicm Exp $ */ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2003,2004 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,7 +29,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 * + * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ /*************************************************************************** @@ -39,7 +39,7 @@ #include "menu.priv.h" -MODULE_ID("$From: m_pad.c,v 1.5 2000/12/10 02:16:48 tom Exp $") +MODULE_ID("$Id: m_pad.c,v 1.5 2010/01/12 23:22:08 nicm Exp $") /* Macro to redraw menu if it is posted and changed */ #define Refresh_Menu(menu) \ @@ -61,18 +61,20 @@ MODULE_ID("$From: m_pad.c,v 1.5 2000/12/10 02:16:48 tom Exp $") | E_BAD_ARGUMENT - an invalid value has been passed +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -set_menu_pad (MENU *menu, int pad) +set_menu_pad(MENU * menu, int pad) { - bool do_refresh = (menu != (MENU*)0); + bool do_refresh = (menu != (MENU *) 0); - if (!isprint((unsigned char)pad)) + T((T_CALLED("set_menu_pad(%p,%d)"), menu, pad)); + + if (!isprint(UChar(pad))) RETURN(E_BAD_ARGUMENT); - - Normalize_Menu( menu ); + + Normalize_Menu(menu); menu->pad = pad; - + if (do_refresh) - Refresh_Menu( menu ); + Refresh_Menu(menu); RETURN(E_OK); } @@ -86,9 +88,10 @@ set_menu_pad (MENU *menu, int pad) | Return Values : The pad character +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -menu_pad (const MENU * menu) +menu_pad(const MENU * menu) { - return (Normalize_Menu( menu ) -> pad); + T((T_CALLED("menu_pad(%p)"), menu)); + returnCode(Normalize_Menu(menu)->pad); } /* m_pad.c ends here */ |