Update to ncurses 5.7, with local changes reapplied.

This is around eight years worth of changes (previously we were around ncurses
5.2), too many to list - many bug fixes and also a few new functions.

A major bump for libcurses, libpanel, libform and libmenu.

ok deraadt

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/libform/frm_scale.c b/lib/libform/frm_scale.c
index 45ef3c1c8a3..cd76e6ac7e4 100644
--- a/lib/libform/frm_scale.c
+++ b/lib/libform/frm_scale.c
@@ -1,7 +1,5 @@
-/*	$OpenBSD: frm_scale.c,v 1.4 2001/01/22 18:02:16 millert Exp $	*/
-
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2003,2004 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            *
@@ -29,12 +27,12 @@
  ****************************************************************************/
 
 /****************************************************************************
- *   Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997            *
+ *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
 #include "form.priv.h"
 
-MODULE_ID("$From: frm_scale.c,v 1.5 2000/12/10 02:09:37 tom Exp $")
+MODULE_ID("$Id: frm_scale.c,v 1.5 2010/01/12 23:22:07 nicm Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
@@ -47,19 +45,21 @@ MODULE_ID("$From: frm_scale.c,v 1.5 2000/12/10 02:09:37 tom Exp $")
 |                    E_NOT_CONNECTED   - no fields connected to form
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
-scale_form (const FORM * form, int * rows, int * cols)
+scale_form(const FORM *form, int *rows, int *cols)
 {
-  if ( !form )
+  T((T_CALLED("scale_form(%p,%p,%p)"), form, rows, cols));
+
+  if (!form)
     RETURN(E_BAD_ARGUMENT);
 
-  if ( !(form->field) )
+  if (!(form->field))
     RETURN(E_NOT_CONNECTED);
-  
-  if (rows) 
+
+  if (rows)
     *rows = form->rows;
-  if (cols) 
+  if (cols)
     *cols = form->cols;
-  
+
   RETURN(E_OK);
 }