ncurses 6.2 - patch 20200509

[ncurses.git] / form / frm_page.c

diff --git a/form/frm_page.c b/form/frm_page.c
index a371838d950ed882d83650db901df93178c806c0..c8569eef804b1b72d1f475aa4eb54c3b325124e7 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 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,7 +33,7 @@
 
 #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.13 2020/02/02 23:34:34 tom Exp $")

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


@@ -51,14 +52,14 @@ set_form_page(FORM *form, int page)
 {
   int err = E_OK;
 
 {
   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


@@ -98,7 +99,7 @@ set_form_page(FORM *form, int page)
 NCURSES_EXPORT(int)
 form_page(const FORM *form)
 {
 NCURSES_EXPORT(int)
 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);
 }