ncurses 6.2 - patch 20200531

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

diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index a4433bc97e96d9b7b728f12f6d340a953a06ed9b..71e584d779ce53aa73c7d531c0d5d995c6da0e70 100644 (file)
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1999-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2013,2016 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            *
@@ -33,11 +34,11 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: name_match.c,v 1.22 2012/11/18 02:10:17 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.25 2020/02/02 23:34:34 tom Exp $")
 
 #define FirstName _nc_globals.first_name
 
-#if USE_TERMCAP && NCURSES_XNAMES
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
 static const char *
 skip_index(const char *name)
 {
@@ -58,8 +59,6 @@ skip_index(const char *name)
 NCURSES_EXPORT(char *)
 _nc_first_name(const char *const sp)
 {
-    unsigned n;
-
 #if NO_LEAKS
     if (sp == 0) {
        if (FirstName != 0) {
@@ -72,8 +71,9 @@ _nc_first_name(const char *const sp)
            FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
 
        if (FirstName != 0) {
+           unsigned n;
            const char *src = sp;
-#if USE_TERMCAP && NCURSES_XNAMES
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
            src = skip_index(sp);
 #endif
            for (n = 0; n < MAX_NAME_SIZE; n++) {
@@ -93,11 +93,13 @@ _nc_first_name(const char *const sp)
 NCURSES_EXPORT(int)
 _nc_name_match(const char *const namelst, const char *const name, const char *const delim)
 {
-    const char *s, *d, *t;
-    int code, found;
+    const char *s;
 
     if ((s = namelst) != 0) {
        while (*s != '\0') {
+           const char *d, *t;
+           int code, found;
+
            for (d = name; *d != '\0'; d++) {
                if (*s != *d)
                    break;