X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffld_opts.c;h=fee5804a8132b54f6f9ea5eb62a6ab9f8c6727c8;hp=575d172227db10f4b719a0dfec01f0c94cd46387;hb=460005b642d978c6d4b48810803514bd36a6245b;hpb=a8987e73ec254703634802b4f7ee30d3a485524d diff --git a/form/fld_opts.c b/form/fld_opts.c index 575d1722..fee5804a 100644 --- a/form/fld_opts.c +++ b/form/fld_opts.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 1998-2004,2010 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 * @@ -32,7 +33,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_opts.c,v 1.9 2003/10/25 15:17:08 tom Exp $") +MODULE_ID("$Id: fld_opts.c,v 1.13 2020/02/02 23:34:34 tom Exp $") /*---------------------------------------------------------------------------- Field-Options manipulation routines @@ -51,12 +52,15 @@ MODULE_ID("$Id: fld_opts.c,v 1.9 2003/10/25 15:17:08 tom Exp $") | E_SYSTEM_ERROR - system error +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -set_field_opts (FIELD * field, Field_Options opts) +set_field_opts(FIELD *field, Field_Options opts) { int res = E_BAD_ARGUMENT; + + T((T_CALLED("set_field_opts(%p,%d)"), (void *)field, opts)); + opts &= ALL_FIELD_OPTS; if (!(opts & ~ALL_FIELD_OPTS)) - res = _nc_Synchronize_Options( Normalize_Field(field), opts ); + res = _nc_Synchronize_Options(Normalize_Field(field), opts); RETURN(res); } @@ -69,9 +73,11 @@ set_field_opts (FIELD * field, Field_Options opts) | Return Values : The options. +--------------------------------------------------------------------------*/ NCURSES_EXPORT(Field_Options) -field_opts (const FIELD * field) +field_opts(const FIELD *field) { - return ALL_FIELD_OPTS & Normalize_Field( field )->opts; + T((T_CALLED("field_opts(%p)"), (const void *)field)); + + returnCode(ALL_FIELD_OPTS & Normalize_Field(field)->opts); } /*--------------------------------------------------------------------------- @@ -87,15 +93,17 @@ field_opts (const FIELD * field) | E_SYSTEM_ERROR - system error +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -field_opts_on (FIELD * field, Field_Options opts) +field_opts_on(FIELD *field, Field_Options opts) { int res = E_BAD_ARGUMENT; + T((T_CALLED("field_opts_on(%p,%d)"), (void *)field, opts)); + opts &= ALL_FIELD_OPTS; if (!(opts & ~ALL_FIELD_OPTS)) { - Normalize_Field( field ); - res = _nc_Synchronize_Options( field, field->opts | opts ); + Normalize_Field(field); + res = _nc_Synchronize_Options(field, field->opts | opts); } RETURN(res); } @@ -113,17 +121,19 @@ field_opts_on (FIELD * field, Field_Options opts) | E_SYSTEM_ERROR - system error +--------------------------------------------------------------------------*/ NCURSES_EXPORT(int) -field_opts_off (FIELD * field, Field_Options opts) +field_opts_off(FIELD *field, Field_Options opts) { int res = E_BAD_ARGUMENT; + T((T_CALLED("field_opts_off(%p,%d)"), (void *)field, opts)); + opts &= ALL_FIELD_OPTS; if (!(opts & ~ALL_FIELD_OPTS)) { - Normalize_Field( field ); - res = _nc_Synchronize_Options( field, field->opts & ~opts ); + Normalize_Field(field); + res = _nc_Synchronize_Options(field, field->opts & ~opts); } RETURN(res); -} +} /* fld_opts.c ends here */