ncurses 6.2 - patch 20200328

+ correct length of buffer copied in dup_field().
+ remove "$(srcdir)/" from path of library.gpr, needed for out-of-tree
  builds of Ada95 (patch by Adam Van Ymeren).

diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in
index 384fa3cda5cba1888c51475171c3164ee463c949..e0751da90113a1221bc9e4430f75f04dde230266 100644 (file)
--- a/Ada95/src/Makefile.in
+++ b/Ada95/src/Makefile.in
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
 #
 #  Author:  Juergen Pfeifer, 1996
 #

-#  $Id: Makefile.in,v 1.89 2020/02/02 23:34:34 tom Exp $
+#  $Id: Makefile.in,v 1.90 2020/03/28 18:05:56 Adam.Van.Ymeren Exp $

 #
 .SUFFIXES:
 
 #
 .SUFFIXES:
 


@@ -273,9 +273,9 @@ STATIC_DIRS = \
 @USE_GNAT_PROJECTS@            $(STATIC_DIRS)
 @USE_GNAT_PROJECTS@    @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
 @USE_GNAT_PROJECTS@    -rm -f $(GNAT_PROJECT)
 @USE_GNAT_PROJECTS@            $(STATIC_DIRS)
 @USE_GNAT_PROJECTS@    @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
 @USE_GNAT_PROJECTS@    -rm -f $(GNAT_PROJECT)

-@USE_GNAT_PROJECTS@    $(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@USE_GNAT_PROJECTS@    $(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)

 @USE_GNAT_PROJECTS@    @echo "Using GNAT Project:"
 @USE_GNAT_PROJECTS@    @echo "Using GNAT Project:"

-@USE_GNAT_PROJECTS@    @-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
+@USE_GNAT_PROJECTS@    @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"

 @USE_GNAT_PROJECTS@    $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
 @USE_GNAT_PROJECTS@    $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
 @USE_GNAT_PROJECTS@    -rm -f $(GNAT_PROJECT)
 @USE_GNAT_PROJECTS@    $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
 @USE_GNAT_PROJECTS@    $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
 @USE_GNAT_PROJECTS@    -rm -f $(GNAT_PROJECT)


@@ -311,9 +311,9 @@ SHARED_DIRS = \
 @MAKE_ADA_SHAREDLIB@   cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
 @MAKE_ADA_SHAREDLIB@   @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
 @MAKE_ADA_SHAREDLIB@   -rm -f $(GNAT_PROJECT)
 @MAKE_ADA_SHAREDLIB@   cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
 @MAKE_ADA_SHAREDLIB@   @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
 @MAKE_ADA_SHAREDLIB@   -rm -f $(GNAT_PROJECT)

-@MAKE_ADA_SHAREDLIB@   $(SHELL) $(srcdir)/library-cfg.sh dynamic $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
+@MAKE_ADA_SHAREDLIB@   $(SHELL) $(srcdir)/library-cfg.sh dynamic library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)

 @MAKE_ADA_SHAREDLIB@   @echo "Making Ada shared-lib:"
 @MAKE_ADA_SHAREDLIB@   @echo "Making Ada shared-lib:"

-@MAKE_ADA_SHAREDLIB@   @-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
+@MAKE_ADA_SHAREDLIB@   @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"

 @MAKE_ADA_SHAREDLIB@   $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
 @MAKE_ADA_SHAREDLIB@   -rm -f $(GNAT_PROJECT)
 
 @MAKE_ADA_SHAREDLIB@   $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
 @MAKE_ADA_SHAREDLIB@   -rm -f $(GNAT_PROJECT)
 

diff --git a/NEWS b/NEWS
index de87c9aef5f6af5e3765da13b550bf352579b235..55186c76b4f4a4dd309d824a8b28355175b4782b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3466 2020/03/22 00:28:35 tom Exp $
+-- $Id: NEWS,v 1.3469 2020/03/28 23:33:04 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20200328
+       + correct length of buffer copied in dup_field().
+       + remove "$(srcdir)/" from path of library.gpr, needed for out-of-tree
+         builds of Ada95 (patch by Adam Van Ymeren).
+

 20200321
        + improve configure-checks to reduce warnings about unused variables.
        + improve description of error-returns in waddch and waddnstr manual
 20200321
        + improve configure-checks to reduce warnings about unused variables.
        + improve description of error-returns in waddch and waddnstr manual

diff --git a/VERSION b/VERSION
index f66c554cf534962c3d681efd297a3bce0b1f45ca..b8900e05b94d8dee3233670353fdc05d58109098 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20200321
+5:0:10 6.2     20200328

diff --git a/dist.mk b/dist.mk
index 7290f6ab712b1741749263596b039110d1b425c7..b7e827c57f98f1ff8bd686c5bd79105e64c6799b 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1342 2020/03/21 12:15:18 tom Exp $
+# $Id: dist.mk,v 1.1343 2020/03/28 10:37:50 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2

-NCURSES_PATCH = 20200321
+NCURSES_PATCH = 20200328

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/form/fld_dup.c b/form/fld_dup.c
index 9859a09f4e93085debdfde5b1e51afb34dc3500e..cd100ef306977a9854246b796d1c7306e76892d6 100644 (file)
--- a/form/fld_dup.c
+++ b/form/fld_dup.c
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: fld_dup.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.17 2020/03/29 00:39:41 tom Exp $")

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


@@ -61,8 +61,8 @@ dup_field(FIELD *field, int frow, int fcol)
     {
       T((T_CREATE("field %p"), (void *)New_Field));
       *New_Field = *_nc_Default_Field;
     {
       T((T_CREATE("field %p"), (void *)New_Field));
       *New_Field = *_nc_Default_Field;

-      New_Field->frow = (short) frow;
-      New_Field->fcol = (short) fcol;
+      New_Field->frow = (short)frow;
+      New_Field->fcol = (short)fcol;

       New_Field->link = New_Field;
       New_Field->rows = field->rows;
       New_Field->cols = field->cols;
       New_Field->link = New_Field;
       New_Field->rows = field->rows;
       New_Field->cols = field->cols;


@@ -80,13 +80,12 @@ dup_field(FIELD *field, int frow, int fcol)
 
       if (_nc_Copy_Type(New_Field, field))
        {
 
       if (_nc_Copy_Type(New_Field, field))
        {

-         size_t i, len;
+         size_t len;

 
          len = Total_Buffer_Size(New_Field);
 
          len = Total_Buffer_Size(New_Field);

-         if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
+         if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))

            {
            {

-             for (i = 0; i < len; ++i)
-               New_Field->buf[i] = field->buf[i];
+             memcpy(New_Field->buf, field->buf, len);

              returnField(New_Field);
            }
        }
              returnField(New_Field);
            }
        }

diff --git a/man/curs_print.3x b/man/curs_print.3x
index edb5008d7302a4e042c0a2cdcf383d0825a30734..0f526f8c42a38651a633dc05b15b4849310c8bf3 100644 (file)
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_print.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_print.3x,v 1.15 2020/03/28 19:06:28 tom Exp $

 .TH curs_print 3X ""
 .SH NAME
 \fBmcprint\fR \- ship binary data to printer
 .TH curs_print 3X ""
 .SH NAME
 \fBmcprint\fR \- ship binary data to printer


@@ -51,7 +51,7 @@ rule of thumb is to sleep for a second after shipping each 80-character line.
 .SH RETURN VALUE
 The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
 for some reason.
 .SH RETURN VALUE
 The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
 for some reason.

-In this case, errno will contain either an error associated
+In this case, \fBerrno\fP will contain either an error associated

 with \fBwrite\fP(2) or one of the following:
 .TP 5
 ENODEV
 with \fBwrite\fP(2) or one of the following:
 .TP 5
 ENODEV

diff --git a/man/form.3x b/man/form.3x
index 2115ddcf6817d9f6ac6105c6e3066875f61aaec8..91e91ed86af859b7340172cc5c40a7a13e58b387 100644 (file)
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form.3x,v 1.34 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form.3x,v 1.35 2020/03/28 19:06:28 tom Exp $

 .TH form 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH form 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -163,7 +163,7 @@ unpost_form \fBform_post\fR(3X)
 .TE
 .SH RETURN VALUE
 Routines that return pointers return \fBNULL\fR on error,
 .TE
 .SH RETURN VALUE
 Routines that return pointers return \fBNULL\fR on error,

-and set errno to the corresponding error-code returned by functions
+and set \fBerrno\fP to the corresponding error-code returned by functions

 returning an integer.
 Routines that return
 an integer return one of the following error codes:
 returning an integer.
 Routines that return
 an integer return one of the following error codes:

diff --git a/man/form_field.3x b/man/form_field.3x
index 113604d689325dedcd15de5320258250e6cd3d96..b10e5af0b2dae6d2e977a7308f459f0bae2f63bf 100644 (file)
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_field.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field.3x,v 1.15 2020/03/28 19:06:28 tom Exp $

 .TH form_field 3X ""
 .SH NAME
 \fBform_field\fR \- make and break connections between fields and forms
 .TH form_field 3X ""
 .SH NAME
 \fBform_field\fR \- make and break connections between fields and forms


@@ -55,7 +55,7 @@ The function \fBmove_field\fR moves the given field (which must be disconnected)
 to a specified location on the screen.
 .SH RETURN VALUE
 The function \fBform_fields\fR returns a pointer (which may be \fBNULL\fR).
 to a specified location on the screen.
 .SH RETURN VALUE
 The function \fBform_fields\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBfield_count\fR returns \fBERR\fR if the \fIform\fP parameter
 is \fBNULL\fP.
 .PP
 The function \fBfield_count\fR returns \fBERR\fR if the \fIform\fP parameter
 is \fBNULL\fP.

diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 95e963e2bf23ffc4d6f6d7d12aedd6f74834a7f1..cf71d00d7d2775517356cd0bfcc315b1d608bc2e 100644 (file)
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_field_buffer.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_buffer.3x,v 1.26 2020/03/28 19:06:28 tom Exp $

 .TH form_field_buffer 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH form_field_buffer 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -99,7 +99,7 @@ The function \fBset_max_field\fR sets the maximum size for a dynamic field.
 An argument of 0 turns off any maximum size threshold for that field.
 .SH RETURN VALUE
 The \fBfield_buffer\fR function returns NULL on error.
 An argument of 0 turns off any maximum size threshold for that field.
 .SH RETURN VALUE
 The \fBfield_buffer\fR function returns NULL on error.

-It sets errno according to their success:
+It sets \fBerrno\fP according to their success:

 .TP 5
 .B E_OK
 The routine succeeded.
 .TP 5
 .B E_OK
 The routine succeeded.

diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 18ad3b9dd6fc239df2531e1a94140b76e9bb6b63..4b32c55dfc1e80e03740695f77323e9ac25f829b 100644 (file)
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_field_new.3x,v 1.21 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_new.3x,v 1.22 2020/03/28 19:06:28 tom Exp $

 .TH form_field_new 3X ""
 .SH NAME
 \fBnew_field\fR,
 .TH form_field_new 3X ""
 .SH NAME
 \fBnew_field\fR,


@@ -67,9 +67,9 @@ Attribute data is separate.
 .PP
 The function \fBfree_field\fR de-allocates storage associated with a field.
 .SH RETURN VALUE
 .PP
 The function \fBfree_field\fR de-allocates storage associated with a field.
 .SH RETURN VALUE

-The function, \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
+The functions \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return

 \fBNULL\fR on error.
 \fBNULL\fR on error.

-They set errno according to their success:
+They set \fBerrno\fP according to their success:

 .TP 5
 .B E_OK
 The routine succeeded.
 .TP 5
 .B E_OK
 The routine succeeded.

diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 4d6aa57fdea8e5eaeae81c68f64055bd6f896703..8a8427c59ef8277352e08d15602bd569062ad6fc 100644 (file)
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_field_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $

 .TH form_field_userptr 3X ""
 .SH NAME
 \fBset_field_userptr\fR,
 .TH form_field_userptr 3X ""
 .SH NAME
 \fBset_field_userptr\fR,


@@ -47,7 +47,7 @@ These functions get and set
 that field.
 .SH RETURN VALUE
 The function \fBfield_userptr\fR returns a pointer (which may be \fBNULL\fR).
 that field.
 .SH RETURN VALUE
 The function \fBfield_userptr\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBset_field_userptr\fR returns \fBE_OK\fP (success).
 .SH SEE ALSO
 .PP
 The function \fBset_field_userptr\fR returns \fBE_OK\fP (success).
 .SH SEE ALSO

diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index dd350c2bd8ef14246090f82b78a939eea68045a2..b491842074e5c6e211db256cbaa9e23b732d7c32 100644 (file)
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_fieldtype.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.21 2020/03/28 19:06:28 tom Exp $

 .TH form_fieldtype 3X ""
 .SH NAME
 \fBform_fieldtype\fR \- define validation-field types
 .TH form_fieldtype 3X ""
 .SH NAME
 \fBform_fieldtype\fR \- define validation-field types


@@ -99,7 +99,7 @@ These functions take the field pointer and an
 argument-block structure as arguments.
 .SH RETURN VALUE
 The pointer-valued routines return NULL on error.
 argument-block structure as arguments.
 .SH RETURN VALUE
 The pointer-valued routines return NULL on error.

-They set errno according to their success:
+They set \fBerrno\fP according to their success:

 .TP 5
 .B E_OK
 The routine succeeded.
 .TP 5
 .B E_OK
 The routine succeeded.

diff --git a/man/form_new.3x b/man/form_new.3x
index 25513bd6eb4cfd98183fcfa57b3b2a0ac7e056c8..dd2eefb6a4d44a21b5d7f5b116ad26012a6777d4 100644 (file)
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_new.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_new.3x,v 1.13 2020/03/28 19:06:28 tom Exp $

 .TH form_new 3X ""
 .SH NAME
 \fBnew_form\fR,
 .TH form_new 3X ""
 .SH NAME
 \fBnew_form\fR,


@@ -48,7 +48,7 @@ The function \fBfree_form\fR disconnects \fIform\fR from its field array
 and frees the storage allocated for the form.
 .SH RETURN VALUE
 The function \fBnew_form\fR returns \fBNULL\fR on error.
 and frees the storage allocated for the form.
 .SH RETURN VALUE
 The function \fBnew_form\fR returns \fBNULL\fR on error.

-It sets errno according to the function's success:
+It sets \fBerrno\fP according to the function's success:

 .TP 5
 .B E_OK
 The routine succeeded.
 .TP 5
 .B E_OK
 The routine succeeded.

diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index a816370a3f960389cc1351f892470bb36173f858..0cad1ad031e667765170dade57e0212a204efcdc 100644 (file)
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $

 .TH form_requestname 3X ""
 .SH NAME
 \fBform_request_by_name\fP,
 .TH form_requestname 3X ""
 .SH NAME
 \fBform_request_by_name\fP,


@@ -48,11 +48,11 @@ The function \fBform_request_by_name\fR searches in the name-table for a request
 with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE
 with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE

-\fBform_request_name\fR returns \fBNULL\fR on error and sets errno
+\fBform_request_name\fR returns \fBNULL\fR on error and sets \fBerrno\fP

 to \fBE_BAD_ARGUMENT\fR.
 .br
 \fBform_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
 to \fBE_BAD_ARGUMENT\fR.
 .br
 \fBform_request_by_name\fR returns \fBE_NO_MATCH\fR on error.

-It does not set errno.
+It does not set \fBerrno\fP.

 .SH SEE ALSO
 \fBcurses\fR(3X), \fBform\fR(3X).
 .SH NOTES
 .SH SEE ALSO
 \fBcurses\fR(3X), \fBform\fR(3X).
 .SH NOTES

diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 4af4e18fd4d0220b67232527a4ea6bca8dd4fabd..266b13efd286163b71bf5b88cecd8e466d2bdc44 100644 (file)
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: form_userptr.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_userptr.3x,v 1.17 2020/03/28 19:06:28 tom Exp $

 .TH form_userptr 3X ""
 .SH NAME
 \fBset_form_userptr\fP,
 .TH form_userptr 3X ""
 .SH NAME
 \fBset_form_userptr\fP,


@@ -46,7 +46,7 @@ application-specific data (that is, the form-driver code leaves it alone).
 These functions get and set the form user pointer field.
 .SH RETURN VALUE
 The function \fBform_userptr\fR returns a pointer (which may be \fBNULL\fR).
 These functions get and set the form user pointer field.
 .SH RETURN VALUE
 The function \fBform_userptr\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBset_form_userptr\fR returns \fBE_OK\fP (success).
 .SH SEE ALSO
 .PP
 The function \fBset_form_userptr\fR returns \fBE_OK\fP (success).
 .SH SEE ALSO

diff --git a/man/menu_items.3x b/man/menu_items.3x
index 4d018022bcd9de78b3e94aeba81ec64ef69b6058..939e034d7c99adbcb58718fd30350411a84c7e71 100644 (file)
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_items.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_items.3x,v 1.15 2020/03/28 19:06:28 tom Exp $

 .TH menu_items 3X ""
 .SH NAME
 \fBset_menu_items\fR,
 .TH menu_items 3X ""
 .SH NAME
 \fBset_menu_items\fR,


@@ -52,7 +52,7 @@ The function \fBmenu_items\fR returns the item array of the given menu.
 The function \fBitem_count\fR returns the count of items in \fImenu\fR.
 .SH RETURN VALUE
 The function \fBmenu_items\fR returns a pointer (which may be \fBNULL\fR).
 The function \fBitem_count\fR returns the count of items in \fImenu\fR.
 .SH RETURN VALUE
 The function \fBmenu_items\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
 return value) if its \fImenu\fP parameter is \fBNULL\fP.
 .PP
 The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
 return value) if its \fImenu\fP parameter is \fBNULL\fP.

diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 9ad0989fa879b67e845515dbaa9e16395ec7ee48..0de4a27ed6e510dd74cf187a7e1cad457c66d8ae 100644 (file)
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_mark.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_mark.3x,v 1.16 2020/03/28 19:06:28 tom Exp $

 .TH menu_mark 3X ""
 .SH NAME
 \fBset_menu_mark\fP,
 .TH menu_mark 3X ""
 .SH NAME
 \fBset_menu_mark\fP,


@@ -58,7 +58,7 @@ The function \fBmenu_mark\fR returns the menu's mark string (or \fBNULL\fR if
 there is none).
 .SH RETURN VALUE
 The function \fBmenu_mark\fR returns a pointer (which may be \fBNULL\fR).
 there is none).
 .SH RETURN VALUE
 The function \fBmenu_mark\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBset_menu_mark\fR may return the following error codes:
 .TP 5
 .PP
 The function \fBset_menu_mark\fR may return the following error codes:
 .TP 5

diff --git a/man/menu_new.3x b/man/menu_new.3x
index 46e415e8e25c68892e913ab66cfae1e48aadc624..7854376e3053fb1f18194e320e60e45b5ec613a0 100644 (file)
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_new.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_new.3x,v 1.16 2020/03/28 19:06:28 tom Exp $

 .TH menu_new 3X ""
 .SH NAME
 \fBnew_menu\fP,
 .TH menu_new 3X ""
 .SH NAME
 \fBnew_menu\fP,


@@ -48,7 +48,7 @@ The function \fBfree_menu\fR disconnects \fImenu\fR from its item array
 and frees the storage allocated for the menu.
 .SH RETURN VALUE
 The function \fBnew_menu\fR returns \fBNULL\fR on error.
 and frees the storage allocated for the menu.
 .SH RETURN VALUE
 The function \fBnew_menu\fR returns \fBNULL\fR on error.

-It sets errno according to the function's failure:
+It sets \fBerrno\fP according to the function's failure:

 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.

diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index ce439b472ca87ec6280a7d2cf899670c8cd51550..f7b34425c45a6a758d3f124329cacdc3e3e14228 100644 (file)
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_pattern.3x,v 1.18 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_pattern.3x,v 1.19 2020/03/28 19:06:28 tom Exp $

 .TH menu_pattern 3X ""
 .SH NAME
 \fBset_menu_pattern\fP,
 .TH menu_pattern 3X ""
 .SH NAME
 \fBset_menu_pattern\fP,


@@ -57,7 +57,7 @@ The function \fBmenu_pattern\fR returns a pointer,
 which is \fBNULL\fR if the \fImenu\fP parameter is \fBNULL\fP.
 Otherwise, it is a pointer to a string which is empty
 if no pattern has been set.
 which is \fBNULL\fR if the \fImenu\fP parameter is \fBNULL\fP.
 Otherwise, it is a pointer to a string which is empty
 if no pattern has been set.

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The function \fBset_menu_pattern\fR may return the following error codes:
 .TP 5
 .PP
 The function \fBset_menu_pattern\fR may return the following error codes:
 .TP 5

diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index c62ec503a43d7c4cbe8dab82114cc89b10e7aeb9..30992c07b2d357c5c0d484afaed34f6fec1bd5cf 100644 (file)
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $

 .TH menu_requestname 3X ""
 .SH NAME
 \fBmenu_request_by_name\fP,
 .TH menu_requestname 3X ""
 .SH NAME
 \fBmenu_request_by_name\fP,


@@ -49,10 +49,10 @@ with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE
 \fBmenu_request_name\fR returns \fBNULL\fR on error
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE
 \fBmenu_request_name\fR returns \fBNULL\fR on error

-and sets errno to \fBE_BAD_ARGUMENT\fR.
+and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fR.

 .br
 \fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
 .br
 \fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.

-It does not set errno.
+It does not set \fBerrno\fP.

 .SH SEE ALSO
 \fBcurses\fR(3X), \fBmenu\fR(3X).
 .SH NOTES
 .SH SEE ALSO
 \fBcurses\fR(3X), \fBmenu\fR(3X).
 .SH NOTES

diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 15cc14b9770b2170e218b8b7ce650e01c6478222..3ed7abbf222cc9c33c8dafdb10c7fc658b9dd395 100644 (file)
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: menu_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $

 .TH menu_userptr 3X ""
 .SH NAME
 \fBset_menu_userptr\fP,
 .TH menu_userptr 3X ""
 .SH NAME
 \fBset_menu_userptr\fP,


@@ -46,7 +46,7 @@ application-specific data (that is, the menu-driver code leaves it alone).
 These functions get and set the menu user pointer field.
 .SH RETURN VALUE
 \fBmenu_userptr\fR returns a pointer (which may be \fBNULL\fR).
 These functions get and set the menu user pointer field.
 .SH RETURN VALUE
 \fBmenu_userptr\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
 .SH SEE ALSO
 .PP
 \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
 .SH SEE ALSO

diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index b1736c7394e52be5356446132aece827e4b0afe3..360f799728bb3385a7cd3b2eca5760e8d527553b 100644 (file)
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: mitem_current.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_current.3x,v 1.18 2020/03/28 19:06:28 tom Exp $

 .TH mitem_current 3X ""
 .SH NAME
 \fBmitem_current\fR \- set and get current_menu_item
 .TH mitem_current 3X ""
 .SH NAME
 \fBmitem_current\fR \- set and get current_menu_item


@@ -63,7 +63,7 @@ The function \fBitem_index\fR returns the (zero-origin) index of \fIitem\fR in
 the menu's item pointer list.
 .SH RETURN VALUE
 \fBcurrent_item\fR returns a pointer (which may be \fBNULL\fR).
 the menu's item pointer list.
 .SH RETURN VALUE
 \fBcurrent_item\fR returns a pointer (which may be \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 \fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
 error value) if their \fImenu\fP parameter is \fBNULL\fP.
 .PP
 \fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
 error value) if their \fImenu\fP parameter is \fBNULL\fP.

diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 0207a9ac1f295a71528cc5dae640d408bc05c426..90ab3f74e7add129c004fc91c307665dff7a873f 100644 (file)
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: mitem_name.3x,v 1.11 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_name.3x,v 1.12 2020/03/28 19:06:28 tom Exp $

 .TH mitem_name 3X ""
 .SH NAME
 \fBitem_name\fR,
 .TH mitem_name 3X ""
 .SH NAME
 \fBitem_name\fR,


@@ -47,7 +47,7 @@ The function \fBitem_description\fR returns the description part of the given
 item.
 .SH RETURN VALUE
 These routines return a pointer (which may be \fBNULL\fR).
 item.
 .SH RETURN VALUE
 These routines return a pointer (which may be \fBNULL\fR).

-They do not set errno.
+They do not set \fBerrno\fP.

 .SH SEE ALSO
 \fBcurses\fR(3X), \fBmenu\fR(3X).
 .SH NOTES
 .SH SEE ALSO
 \fBcurses\fR(3X), \fBmenu\fR(3X).
 .SH NOTES

diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 9f591f651a57d4f50e52606ee453c224ea8b34b7..bc160f8c5b21f103963021504ad1565a414194a7 100644 (file)
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: mitem_new.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_new.3x,v 1.17 2020/03/28 19:06:28 tom Exp $

 .TH mitem_new 3X ""
 .SH NAME
 \fBnew_item\fP,
 .TH mitem_new 3X ""
 .SH NAME
 \fBnew_item\fP,


@@ -56,7 +56,7 @@ is the responsibility of the application to release the memory for the
 name or the description of the item.
 .SH RETURN VALUE
 The function \fBnew_item\fR returns \fBNULL\fR on error.
 name or the description of the item.
 .SH RETURN VALUE
 The function \fBnew_item\fR returns \fBNULL\fR on error.

-It sets errno according to the function's failure:
+It sets \fBerrno\fP according to the function's failure:

 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.

diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index f2639fda96e9297c5658cbe080a3ad5f2f3213fa..e17dbc8db250be8697c8463d0468c96a0f3e8e59 100644 (file)
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: mitem_userptr.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_userptr.3x,v 1.15 2020/03/28 19:06:28 tom Exp $

 .TH mitem_userptr 3X ""
 .SH NAME
 \fBset_item_userptr\fP,
 .TH mitem_userptr 3X ""
 .SH NAME
 \fBset_item_userptr\fP,


@@ -47,7 +47,7 @@ These functions get and set
 that field.
 .SH RETURN VALUE
 The function \fBitem_userptr\fR returns a pointer (possibly \fBNULL\fR).
 that field.
 .SH RETURN VALUE
 The function \fBitem_userptr\fR returns a pointer (possibly \fBNULL\fR).

-It does not set errno.
+It does not set \fBerrno\fP.

 .PP
 The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
 .
 .PP
 The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
 .

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index efd4ba9e1015cb70ff1b43b10a305392af1dfb7c..20241500aea33713f8ddea25b22f6eb71440d4dd 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Mar 2020 06:37:50 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index efd4ba9e1015cb70ff1b43b10a305392af1dfb7c..20241500aea33713f8ddea25b22f6eb71440d4dd 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Mar 2020 06:37:50 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 17cbc6aad493bfa57717cda4420359970e828ebc..d405d5638e0ce141cac5215117a8f4a9a700fa52 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Mar 2020 06:37:50 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f1d0c0eb65577ce25ef066add0c96eb6b5cc7258..4e80e5b08d6506381f481c456ee2d74b7567493c 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.386 2020/03/21 12:15:18 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.387 2020/03/28 10:37:50 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r

-!define VERSION_MMDD  "0321"\r
+!define VERSION_MMDD  "0328"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 5784ec01e5e589dfa5c232a61dc7fca77cf5feae..2127aaf0842e006c397e95966ae0b9c00fc71160 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2

-Release: 20200321
+Release: 20200328

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index c99124396408de422fb55927db3f9c35650b44ed..092ebfc347bae55a808a72d6100121d51377fd71 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2

-Release: 20200321
+Release: 20200328

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index ee537bf72f106e8c029a0d45eb9167531ad1d1f2..3fb47ac0fa83f9647aae5f290a292cfc4164ee52 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2

-Release: 20200321
+Release: 20200328

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/move_field.c b/test/move_field.c
index 7681225bf9882d8c1e97c0f0ed512de14c929f98..79b0b4df2369054ac7184d846961b4a84f324c4a 100644 (file)
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: move_field.c,v 1.5 2020/03/21 22:04:03 tom Exp $
+ * $Id: move_field.c,v 1.6 2020/03/28 17:43:03 tom Exp $

  *
  * Demonstrate move_field().
  */
  *
  * Demonstrate move_field().
  */


@@ -269,7 +269,7 @@ my_edit_field(FORM *form, int *result)
 }
 
 static FIELD **
 }
 
 static FIELD **

-copy_fields(FIELD **source, int length)
+copy_fields(FIELD **source, size_t length)

 {
     FIELD **target = calloc(length + 1, sizeof(FIELD *));
     memcpy(target, source, length * sizeof(FIELD *));
 {
     FIELD **target = calloc(length + 1, sizeof(FIELD *));
     memcpy(target, source, length * sizeof(FIELD *));


@@ -305,8 +305,9 @@ do_demo(FORM *form)
     FIELD *my_field = current_field(form);
 
     if (count > 0 && my_field != NULL) {
     FIELD *my_field = current_field(form);
 
     if (count > 0 && my_field != NULL) {

-       FIELD **old_fields = copy_fields(form_fields(form), count);
-       FIELD **new_fields = copy_fields(form_fields(form), count);
+       size_t needed = (size_t) count;
+       FIELD **old_fields = copy_fields(form_fields(form), needed);
+       FIELD **new_fields = copy_fields(form_fields(form), needed);

        int ch;
 
        if (old_fields != NULL && new_fields != NULL) {
        int ch;
 
        if (old_fields != NULL && new_fields != NULL) {