From 6ee254699bf787d78835419be2b3241fb037d444 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 12 Jan 2010 23:22:15 +0000 Subject: 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 --- lib/libform/fld_pad.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'lib/libform/fld_pad.c') diff --git a/lib/libform/fld_pad.c b/lib/libform/fld_pad.c index 5d2e4dfdceb..9197b731bef 100644 --- a/lib/libform/fld_pad.c +++ b/lib/libform/fld_pad.c @@ -1,7 +1,5 @@ -/* $OpenBSD: fld_pad.c,v 1.4 2001/01/22 18:02:13 millert 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,11 +27,12 @@ ****************************************************************************/ /**************************************************************************** - * Author: Juergen Pfeifer 1995,1997 * + * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ + #include "form.priv.h" -MODULE_ID("$From: fld_pad.c,v 1.5 2000/12/10 02:09:38 tom Exp $") +MODULE_ID("$Id: fld_pad.c,v 1.5 2010/01/12 23:22:07 nicm Exp $") /*--------------------------------------------------------------------------- | Facility : libnform @@ -47,17 +46,19 @@ MODULE_ID("$From: fld_pad.c,v 1.5 2000/12/10 02:09:38 tom Exp $") | E_SYSTEM_ERROR - system error +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -set_field_pad (FIELD * field, int ch) +set_field_pad(FIELD *field, int ch) { int res = E_BAD_ARGUMENT; - Normalize_Field( field ); - if (isprint((unsigned char)ch)) + T((T_CALLED("set_field_pad(%p,%d)"), field, ch)); + + Normalize_Field(field); + if (isprint(UChar(ch))) { if (field->pad != ch) { field->pad = ch; - res = _nc_Synchronize_Attributes( field ); + res = _nc_Synchronize_Attributes(field); } else res = E_OK; @@ -74,9 +75,11 @@ set_field_pad (FIELD * field, int ch) | Return Values : The pad character. +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -field_pad (const FIELD * field) +field_pad(const FIELD *field) { - return Normalize_Field( field )->pad; + T((T_CALLED("field_pad(%p)"), field)); + + returnCode(Normalize_Field(field)->pad); } /* fld_pad.c ends here */ -- cgit v1.2.3