ncurses 6.2 - patch 20200711

[ncurses.git] / include / capdefaults.c

diff --git a/include/capdefaults.c b/include/capdefaults.c
index 33f2fe8f029909a71105646fa442b822e74d4937..951a9ca4bb5c7cc7529c8901498ceacb0461bb73 100644 (file)
--- a/include/capdefaults.c
+++ b/include/capdefaults.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2008 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2000,2008 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            *


@@ -32,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 

-/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */
+/* $Id: capdefaults.c,v 1.15 2020/02/02 23:34:34 tom Exp $ */

 
     /*
      * Compute obsolete capabilities.  The reason this is an include file is
 
     /*
      * Compute obsolete capabilities.  The reason this is an include file is


@@ -44,11 +45,11 @@
      * postprocess_termcap().
      */
 {
      * postprocess_termcap().
      */
 {

-    char *sp;
+    char *strp;

     short capval;
 
 #define EXTRACT_DELAY(str) \
     short capval;
 
 #define EXTRACT_DELAY(str) \

-       (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0)
+       (short) (strp = strchr(str, '*'), strp ? atoi(strp+1) : 0)

 
     /* current (4.4BSD) capabilities marked obsolete */
     if (VALID_STRING(carriage_return)
 
     /* current (4.4BSD) capabilities marked obsolete */
     if (VALID_STRING(carriage_return)