ncurses 5.6 - patch 20070728

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

diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index eed3d04465a61941a693f853d92002493c54b2eb..a836543db824de67c4a570b857f0979de2f884e1 100644 (file)
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *


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

-MODULE_ID("$Id: parse_entry.c,v 1.62 2005/06/02 22:04:32 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.64 2007/07/28 22:21:22 tom Exp $")

 
 #ifdef LINT
 static short const parametrized[] =
 
 #ifdef LINT
 static short const parametrized[] =


@@ -142,7 +142,7 @@ _nc_extend_names(ENTRY * entryp, char *name, int token_type)
        case BOOLEAN:
            tp->ext_Booleans += 1;
            tp->num_Booleans += 1;
        case BOOLEAN:
            tp->ext_Booleans += 1;
            tp->num_Booleans += 1;

-           tp->Booleans = typeRealloc(char, tp->num_Booleans, tp->Booleans);
+           tp->Booleans = typeRealloc(NCURSES_SBOOL, tp->num_Booleans, tp->Booleans);

            for (last = tp->num_Booleans - 1; last > tindex; last--)
                tp->Booleans[last] = tp->Booleans[last - 1];
            break;
            for (last = tp->num_Booleans - 1; last > tindex; last--)
                tp->Booleans[last] = tp->Booleans[last - 1];
            break;


@@ -300,7 +300,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent)
                    if (entryp->nuses != 0) {
                        BAD_TC_USAGE
                    }
                    if (entryp->nuses != 0) {
                        BAD_TC_USAGE
                    }

-                   for (ap = _nc_capalias_table; ap->from; ap++)
+                   for (ap = _nc_get_alias_table(TRUE); ap->from; ap++)

                        if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
                            if (ap->to == (char *) 0) {
                                _nc_warning("%s (%s termcap extension) ignored",
                        if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
                            if (ap->to == (char *) 0) {
                                _nc_warning("%s (%s termcap extension) ignored",


@@ -315,7 +315,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent)
                            break;
                        }
                } else {        /* if (_nc_syntax == SYN_TERMINFO) */
                            break;
                        }
                } else {        /* if (_nc_syntax == SYN_TERMINFO) */

-                   for (ap = _nc_infoalias_table; ap->from; ap++)
+                   for (ap = _nc_get_alias_table(FALSE); ap->from; ap++)

                        if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
                            if (ap->to == (char *) 0) {
                                _nc_warning("%s (%s terminfo extension) ignored",
                        if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
                            if (ap->to == (char *) 0) {
                                _nc_warning("%s (%s terminfo extension) ignored",