ncurses 6.2 - patch 20210911

[ncurses.git] / ncurses / tinfo / alloc_entry.c

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 4bf7d6c8a082248e4fd59eb6169f39808f1d7bb7..c13f86eeac1b5e736e956c4d0bb3aa884b280fbe 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: alloc_entry.c,v 1.64 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.66 2021/08/08 00:09:37 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2


@@ -93,14 +93,14 @@ _nc_copy_entry(ENTRY * oldp)
 
 /* save a copy of string in the string buffer */
 NCURSES_EXPORT(char *)
 
 /* save a copy of string in the string buffer */
 NCURSES_EXPORT(char *)

-_nc_save_str(const char *const string)
+_nc_save_str(const char *string)

 {
     char *result = 0;
     size_t old_next_free = next_free;
     size_t len;
 
     if (!VALID_STRING(string))
 {
     char *result = 0;
     size_t old_next_free = next_free;
     size_t len;
 
     if (!VALID_STRING(string))

-       return _nc_save_str("");
+       string = "";

     len = strlen(string) + 1;
 
     if (len == 1 && next_free != 0) {
     len = strlen(string) + 1;
 
     if (len == 1 && next_free != 0) {


@@ -242,7 +242,7 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     _nc_align_termtype(to, from);
 #endif
     for_each_boolean(i, from) {
     _nc_align_termtype(to, from);
 #endif
     for_each_boolean(i, from) {

-       if (to->Booleans[i] != (char) CANCELLED_BOOLEAN) {
+       if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {

            int mergebool = from->Booleans[i];
 
            if (mergebool == CANCELLED_BOOLEAN)
            int mergebool = from->Booleans[i];
 
            if (mergebool == CANCELLED_BOOLEAN)