[5820] minor header file cleanup

[Gavin D. Smith]

Revision: 5820
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5820
Author:   gavin
Date:     2014-09-12 11:27:11 +0000 (Fri, 12 Sep 2014)
Log Message:
-----------
minor header file cleanup

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/echo-area.c
    trunk/info/indices.c
    trunk/info/info.h
    trunk/info/nodes.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-09-12 11:12:14 UTC (rev 5819)
+++ trunk/ChangeLog     2014-09-12 11:27:11 UTC (rev 5820)
@@ -11,6 +11,12 @@
        * info/session.c (info_select_reference, info_follow_menus): Remove
        unused local variables.
 
+       * info/info.h: Remove declaration for removed variable.
+       (info_toupper, info_tolower): Removed.  Use toupper and tolower
+       instead.
+       * info/info.h, info/nodes.h (strict_node_location_p): Declaration
+       moved.
+
 2014-09-10  Gavin Smith  <address@hidden>
 
        * info/display.c (display_scroll_region): New function.

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-09-12 11:12:14 UTC (rev 5819)
+++ trunk/info/echo-area.c      2014-09-12 11:27:11 UTC (rev 5820)
@@ -1248,8 +1248,8 @@
         int c1, c2;
 
         for (j = 0;
-             (c1 = info_tolower (completions_found[i - 1]->label[j])) &&
-             (c2 = info_tolower (completions_found[i]->label[j]));
+             (c1 = tolower (completions_found[i - 1]->label[j]))
+             && (c2 = tolower (completions_found[i]->label[j]));
              j++)
           if (c1 != c2)
             break;

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-09-12 11:12:14 UTC (rev 5819)
+++ trunk/info/indices.c        2014-09-12 11:27:11 UTC (rev 5820)
@@ -455,9 +455,9 @@
 
         for (k = 0; k < ls; k++)
           if (upper)
-            match[k + start] = info_tolower (match[k + start]);
+            match[k + start] = tolower (match[k + start]);
           else
-            match[k + start] = info_toupper (match[k + start]);
+            match[k + start] = toupper (match[k + start]);
       }
 
     {

Modified: trunk/info/info.h
===================================================================
--- trunk/info/info.h   2014-09-12 11:12:14 UTC (rev 5819)
+++ trunk/info/info.h   2014-09-12 11:27:11 UTC (rev 5820)
@@ -41,9 +41,6 @@
 #include "mbiter.h"
 #include "mbchar.h"
 
-#define info_toupper(x) (islower (x) ? toupper (x) : x)
-#define info_tolower(x) (isupper (x) ? tolower (x) : x)
-
 #if !defined (whitespace)
 #  define whitespace(c) ((c == ' ') || (c == '\t'))
 #endif /* !whitespace */
@@ -78,9 +75,6 @@
    info_error () function to determine how to format and output errors. */
 extern int info_windows_initialized_p;
 
-/* Non-zero if an error message has been printed. */
-extern int info_error_was_printed;
-
 /* Non-zero means ring terminal bell on errors. */
 extern int info_error_rings_bell_p;
 
@@ -90,9 +84,6 @@
 /* Non-zero means don't remove ANSI escape sequences from man pages.  */
 extern int raw_escapes_p;
 
-/* Non-zero means don't try to be smart when searching for nodes.  */
-extern int strict_node_location_p;
-
 extern unsigned debug_level;
 
 #define debug(n,c)                                                     \

Modified: trunk/info/nodes.h
===================================================================
--- trunk/info/nodes.h  2014-09-12 11:12:14 UTC (rev 5819)
+++ trunk/info/nodes.h  2014-09-12 11:27:11 UTC (rev 5820)
@@ -181,6 +181,10 @@
 
 /* Create a new, empty file buffer. */
 extern FILE_BUFFER *make_file_buffer (void);
+
+/* Non-zero means don't try to be smart when searching for nodes.  */
+extern int strict_node_location_p;
+
 
 /* Found in dir.c */
 extern NODE *get_dir_node (void);