ncurses 5.7 - patch 20101204

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 16850eaca7e7e3e9138136b7313fa340f08ad499..eda581b9fc70d272538173cee0659bd2046b54c3 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -51,9 +51,8 @@
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: comp_parse.c,v 1.67 2007/08/12 13:10:45 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.72 2010/01/23 17:57:43 tom Exp $")

 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;


@@ -92,16 +91,18 @@ force_bar(char *dst, char *src)
     }
     return src;
 }
     }
     return src;
 }

+#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)

 
 NCURSES_EXPORT(bool)
 _nc_entry_match(char *n1, char *n2)
 /* do any of the aliases in a pair of terminal names match? */
 {
     char *pstart, *qstart, *pend, *qend;
 
 NCURSES_EXPORT(bool)
 _nc_entry_match(char *n1, char *n2)
 /* do any of the aliases in a pair of terminal names match? */
 {
     char *pstart, *qstart, *pend, *qend;

-    char nc1[MAX_NAME_SIZE + 2], nc2[MAX_NAME_SIZE + 2];
+    char nc1[MAX_NAME_SIZE + 2];
+    char nc2[MAX_NAME_SIZE + 2];

 
 

-    n1 = force_bar(nc1, n1);
-    n2 = force_bar(nc2, n2);
+    n1 = ForceBar(nc1, n1);
+    n2 = ForceBar(nc2, n2);

 
     for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1)
        for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1)
 
     for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1)
        for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1)


@@ -183,7 +184,8 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;

-    int i, unresolved, total_unresolved, multiples;
+    unsigned i;
+    int unresolved, total_unresolved, multiples;

 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 


@@ -472,8 +474,11 @@ _nc_leaks_tic(void)
 {
     _nc_alloc_entry_leaks();
     _nc_captoinfo_leaks();
 {
     _nc_alloc_entry_leaks();
     _nc_captoinfo_leaks();

-    _nc_comp_captab_leaks();

     _nc_comp_scan_leaks();
     _nc_comp_scan_leaks();

+#if BROKEN_LINKER || USE_REENTRANT
+    _nc_names_leaks();
+    _nc_codes_leaks();
+#endif

     _nc_tic_expand(0, FALSE, 0);
 }
 
     _nc_tic_expand(0, FALSE, 0);
 }