ncurses 5.9 - patch 20140323

[ncurses.git] / form / frm_opts.c

diff --git a/form/frm_opts.c b/form/frm_opts.c
index 22ca3a1e1176090a5831081d687bb276c68f3f42..42d6267fba0b90a1a8ce777a9f5657c7c02c4063 100644 (file)
--- a/form/frm_opts.c
+++ b/form/frm_opts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2012,2013 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -28,12 +28,11 @@
 
 /****************************************************************************
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
 
 /****************************************************************************
  *   Author:  Juergen Pfeifer, 1995,1997                                    *

- *   Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en             *

  ****************************************************************************/
 
 #include "form.priv.h"
 
  ****************************************************************************/
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_opts.c,v 1.10 2002/07/06 15:33:27 juergen Exp $")
+MODULE_ID("$Id: frm_opts.c,v 1.17 2013/08/24 22:58:47 tom Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  


@@ -46,14 +45,16 @@ MODULE_ID("$Id: frm_opts.c,v 1.10 2002/07/06 15:33:27 juergen Exp $")
 |                    E_BAD_ARGUMENT    - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
 |                    E_BAD_ARGUMENT    - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)

-set_form_opts (FORM * form, Form_Options  opts)
+set_form_opts(FORM *form, Form_Options opts)

 {
 {

-  opts &= ALL_FORM_OPTS;
-  if (opts & ~ALL_FORM_OPTS)
+  T((T_CALLED("set_form_opts(%p,%d)"), (void *)form, opts));
+
+  opts &= (Form_Options) ALL_FORM_OPTS;
+  if ((unsigned)opts & ~ALL_FORM_OPTS)

     RETURN(E_BAD_ARGUMENT);
   else
     {
     RETURN(E_BAD_ARGUMENT);
   else
     {

-      Normalize_Form( form )->opts = opts;
+      Normalize_Form(form)->opts = opts;

       RETURN(E_OK);
     }
 }
       RETURN(E_OK);
     }
 }


@@ -67,9 +68,10 @@ set_form_opts (FORM * form, Form_Options  opts)
 |   Return Values :  The option flags.
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(Form_Options)
 |   Return Values :  The option flags.
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(Form_Options)

-form_opts (const FORM * form)
+form_opts(const FORM *form)

 {
 {

-  return (Normalize_Form(form)->opts & ALL_FORM_OPTS);
+  T((T_CALLED("form_opts(%p)"), (const void *)form));
+  returnCode((Form_Options) ((unsigned)Normalize_Form(form)->opts & ALL_FORM_OPTS));

 }
 
 /*---------------------------------------------------------------------------
 }
 
 /*---------------------------------------------------------------------------


@@ -83,14 +85,16 @@ form_opts (const FORM * form)
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)

-form_opts_on (FORM * form, Form_Options opts)
+form_opts_on(FORM *form, Form_Options opts)

 {
 {

-  opts &= ALL_FORM_OPTS;
-  if (opts & ~ALL_FORM_OPTS)
+  T((T_CALLED("form_opts_on(%p,%d)"), (void *)form, opts));
+
+  opts &= (Form_Options) ALL_FORM_OPTS;
+  if ((unsigned)opts & ~ALL_FORM_OPTS)

     RETURN(E_BAD_ARGUMENT);
   else
     {
     RETURN(E_BAD_ARGUMENT);
   else
     {

-      Normalize_Form( form )->opts |= opts;    
+      Normalize_Form(form)->opts |= opts;

       RETURN(E_OK);
     }
 }
       RETURN(E_OK);
     }
 }


@@ -106,10 +110,12 @@ form_opts_on (FORM * form, Form_Options opts)
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)

-form_opts_off (FORM * form, Form_Options opts)
+form_opts_off(FORM *form, Form_Options opts)

 {
 {

-  opts &= ALL_FORM_OPTS;
-  if (opts & ~ALL_FORM_OPTS)
+  T((T_CALLED("form_opts_off(%p,%d)"), (void *)form, opts));
+
+  opts &= (Form_Options) ALL_FORM_OPTS;
+  if ((unsigned)opts & ~ALL_FORM_OPTS)

     RETURN(E_BAD_ARGUMENT);
   else
     {
     RETURN(E_BAD_ARGUMENT);
   else
     {