ncurses 6.2 - patch 20210515

[ncurses.git] / form / frm_data.c

diff --git a/form/frm_data.c b/form/frm_data.c
index e52b1bece25dfe3cb7c27f395585d779e9a75a41..3054192281174d1cbead83569067bb17086c761b 100644 (file)
--- a/form/frm_data.c
+++ b/form/frm_data.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 1998-2010,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            *
@@ -32,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_data.c,v 1.13 2004/12/11 22:29:28 tom Exp $")
+MODULE_ID("$Id: frm_data.c,v 1.20 2021/03/27 23:49:58 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
@@ -44,12 +45,12 @@ MODULE_ID("$Id: frm_data.c,v 1.13 2004/12/11 22:29:28 tom Exp $")
 |   Return Values :  TRUE   - there are off-screen data behind
 |                    FALSE  - there are no off-screen data behind
 +--------------------------------------------------------------------------*/
-NCURSES_EXPORT(bool)
+FORM_EXPORT(bool)
 data_behind(const FORM *form)
 {
   bool result = FALSE;
 
-  T((T_CALLED("data_behind(%p)"), form));
+  T((T_CALLED("data_behind(%p)"), (const void *)form));
 
   if (form && (form->status & _POSTED) && form->current)
     {
@@ -80,7 +81,7 @@ data_behind(const FORM *form)
 |
 |   Return Values :  true if only padding cells are found
 +--------------------------------------------------------------------------*/
-INLINE static bool
+NCURSES_INLINE static bool
 Only_Padding(WINDOW *w, int len, int pad)
 {
   bool result = TRUE;
@@ -103,7 +104,7 @@ Only_Padding(WINDOW *w, int len, int pad)
                }
            }
 #else
-         cell = winch(w);
+         cell = (FIELD_CELL)winch(w);
          if (ChCharOf(cell) != ChCharOf(pad))
            {
              result = FALSE;
@@ -131,12 +132,12 @@ Only_Padding(WINDOW *w, int len, int pad)
 |   Return Values :  TRUE   - there are off-screen data ahead
 |                    FALSE  - there are no off-screen data ahead
 +--------------------------------------------------------------------------*/
-NCURSES_EXPORT(bool)
+FORM_EXPORT(bool)
 data_ahead(const FORM *form)
 {
   bool result = FALSE;
 
-  T((T_CALLED("data_ahead(%p)"), form));
+  T((T_CALLED("data_ahead(%p)"), (const void *)form));
 
   if (form && (form->status & _POSTED) && form->current)
     {
@@ -149,12 +150,11 @@ data_ahead(const FORM *form)
 
       if (Single_Line_Field(field))
        {
-         int check_len;
-
          pos = form->begincol + field->cols;
          while (pos < field->dcols)
            {
-             check_len = field->dcols - pos;
+             int check_len = field->dcols - pos;
+
              if (check_len >= field->cols)
                check_len = field->cols;
              cursor_moved = TRUE;