ncurses 5.4

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index a5dc70ce180282b4eb41a8109c8de70508ad567c..203276cd1c917312e10b2dfa912f33d26455dd62 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2002,2003 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            *
@@ -52,7 +52,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.53 2002/09/07 20:01:28 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.57 2003/10/25 22:25:36 tom Exp $")
 
 static void sanity_check(TERMTYPE *);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
@@ -163,7 +163,7 @@ _nc_entry_match(char *n1, char *n2)
  ****************************************************************************/
 
 NCURSES_EXPORT(void)
-_nc_read_entry_source(FILE * fp, char *buf,
+_nc_read_entry_source(FILE *fp, char *buf,
                      int literal, bool silent,
                      bool(*hook) (ENTRY *))
 /* slurp all entries in the given file into core */
@@ -216,7 +216,7 @@ _nc_resolve_uses(bool fullresolve)
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
-    int i, j, unresolved, total_unresolved, multiples;
+    int i, unresolved, total_unresolved, multiples;
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
@@ -389,26 +389,6 @@ _nc_resolve_uses(bool fullresolve)
            (keepgoing);
 
        DEBUG(2, ("MERGES COMPLETED OK"));
-
-       /*
-        * The exit condition of the loop above is such that all entries
-        * must now be resolved.  Now handle cancellations.  In a resolved
-        * entry there should be no cancellation markers.
-        */
-       for_entry_list(qp) {
-           for_each_boolean(j, &(qp->tterm)) {
-               if ((int) qp->tterm.Booleans[j] == CANCELLED_BOOLEAN)
-                   qp->tterm.Booleans[j] = ABSENT_BOOLEAN;
-           }
-           for_each_number(j, &(qp->tterm)) {
-               if (qp->tterm.Numbers[j] == CANCELLED_NUMERIC)
-                   qp->tterm.Numbers[j] = ABSENT_NUMERIC;
-           }
-           for_each_string(j, &(qp->tterm)) {
-               if (qp->tterm.Strings[j] == CANCELLED_STRING)
-                   qp->tterm.Strings[j] = ABSENT_STRING;
-           }
-       }
     }
 
     /*