[7014] remove DUMP_SUBNODES define

[Gavin D. Smith]

Revision: 7014
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7014
Author:   gavin
Date:     2016-02-13 21:26:11 +0000 (Sat, 13 Feb 2016)
Log Message:
-----------
remove DUMP_SUBNODES define

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/info.c
    trunk/info/session.c
    trunk/info/session.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-02-13 21:19:19 UTC (rev 7013)
+++ trunk/ChangeLog     2016-02-13 21:26:11 UTC (rev 7014)
@@ -1,5 +1,12 @@
 2016-02-13  Gavin Smith  <address@hidden>
 
+       * info/session.c (dump_nodes_to_file): Argument changed from 
+       flags argument to a simple Boolean to say whether to dump 
+       subnodes.
+       * info/session.h (DUMP_SUBNODES): Remove definition.
+
+2016-02-13  Gavin Smith  <address@hidden>
+
        * info/nodes.h, info/echo-area.h, info/filesys.h, info/window.h,
        info/indices.h, info/info-utils.h, info/search.h, info/session.h,
        info/variables.h: Remove unnecessary "extern" modifier for 

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2016-02-13 21:19:19 UTC (rev 7013)
+++ trunk/info/info.c   2016-02-13 21:26:11 UTC (rev 7014)
@@ -793,9 +793,6 @@
       dump_subnodes = 1;
     }
 
-  if (dump_subnodes)
-    dump_subnodes = DUMP_SUBNODES;
-  
   /* If the user specified --version, then show the version and exit. */
   if (print_version_p)
     {

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2016-02-13 21:19:19 UTC (rev 7013)
+++ trunk/info/session.c        2016-02-13 21:26:11 UTC (rev 7014)
@@ -3693,7 +3693,7 @@
    the nodes which appear in the menu of each node dumped. */
 void
 dump_nodes_to_file (REFERENCE **references,
-                   char *output_filename, int flags)
+                    char *output_filename, int dump_subnodes)
 {
   int i;
   FILE *output_stream;
@@ -3722,7 +3722,7 @@
       if (dump_node_to_stream (references[i]->filename,
                                references[i]->nodename,
                                output_stream,
-                              flags & DUMP_SUBNODES) == DUMP_SYS_ERROR)
+                               dump_subnodes) == DUMP_SYS_ERROR)
        {
          info_error (_("error writing to %s: %s"), output_filename,
                       strerror (errno));

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2016-02-13 21:19:19 UTC (rev 7013)
+++ trunk/info/session.h        2016-02-13 21:26:11 UTC (rev 7014)
@@ -72,8 +72,6 @@
 int info_select_reference (WINDOW *window, REFERENCE *entry);
 int info_any_buffered_input_p (void);
 
-#define DUMP_SUBNODES 0x02
-
 void dump_nodes_to_file (REFERENCE **references,
                                char *output_filename, int flags);