ncurses 6.2 - patch 20210619

[ncurses.git] / form / frm_page.c

diff --git a/form/frm_page.c b/form/frm_page.c
index a371838d950ed882d83650db901df93178c806c0..ee8dd3837f6b37f4c3ed7f1480cc2e877d60702b 100644 (file)
--- a/form/frm_page.c
+++ b/form/frm_page.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 1998-2010,2012 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            *


@@ -32,12 +33,12 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_page.c,v 1.10 2004/12/11 22:08:21 tom Exp $")
+MODULE_ID("$Id: frm_page.c,v 1.15 2021/06/17 21:20:30 tom Exp $")

 
 /*---------------------------------------------------------------------------
 
 /*---------------------------------------------------------------------------

-|   Facility      :  libnform  
+|   Facility      :  libnform

 |   Function      :  int set_form_page(FORM * form,int  page)
 |   Function      :  int set_form_page(FORM * form,int  page)

-|   
+|

 |   Description   :  Set the page number of the form.
 |
 |   Return Values :  E_OK              - success
 |   Description   :  Set the page number of the form.
 |
 |   Return Values :  E_OK              - success


@@ -46,19 +47,19 @@ MODULE_ID("$Id: frm_page.c,v 1.10 2004/12/11 22:08:21 tom Exp $")
 |                    E_INVALID_FIELD   - current field can't be left
 |                    E_SYSTEM_ERROR    - system error
 +--------------------------------------------------------------------------*/
 |                    E_INVALID_FIELD   - current field can't be left
 |                    E_SYSTEM_ERROR    - system error
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+FORM_EXPORT(int)

 set_form_page(FORM *form, int page)
 {
   int err = E_OK;
 
 set_form_page(FORM *form, int page)
 {
   int err = E_OK;
 

-  T((T_CALLED("set_form_page(%p,%d)"), form, page));
+  T((T_CALLED("set_form_page(%p,%d)"), (void *)form, page));

 
   if (!form || (page < 0) || (page >= form->maxpage))
     RETURN(E_BAD_ARGUMENT);
 
   if (!(form->status & _POSTED))
     {
 
   if (!form || (page < 0) || (page >= form->maxpage))
     RETURN(E_BAD_ARGUMENT);
 
   if (!(form->status & _POSTED))
     {

-      form->curpage = page;
+      form->curpage = (short)page;

       form->current = _nc_First_Active_Field(form);
     }
   else
       form->current = _nc_First_Active_Field(form);
     }
   else


@@ -87,18 +88,18 @@ set_form_page(FORM *form, int page)
 }
 
 /*---------------------------------------------------------------------------
 }
 
 /*---------------------------------------------------------------------------

-|   Facility      :  libnform  
+|   Facility      :  libnform

 |   Function      :  int form_page(const FORM * form)
 |   Function      :  int form_page(const FORM * form)

-|   
+|

 |   Description   :  Return the current page of the form.
 |
 |   Return Values :  >= 0  : current page number
 |                    -1    : invalid form pointer
 +--------------------------------------------------------------------------*/
 |   Description   :  Return the current page of the form.
 |
 |   Return Values :  >= 0  : current page number
 |                    -1    : invalid form pointer
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+FORM_EXPORT(int)

 form_page(const FORM *form)
 {
 form_page(const FORM *form)
 {

-  T((T_CALLED("form_page(%p)"), form));
+  T((T_CALLED("form_page(%p)"), (const void *)form));

 
   returnCode(Normalize_Form(form)->curpage);
 }
 
   returnCode(Normalize_Form(form)->curpage);
 }