[7913] merge get_filename_and_nodename into caller

[gavinsmith0123]

Revision: 7913
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7913
Author:   gavin
Date:     2017-07-09 13:23:09 -0400 (Sun, 09 Jul 2017)
Log Message:
-----------
merge get_filename_and_nodename into caller

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/nodes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-07-09 15:55:59 UTC (rev 7912)
+++ trunk/ChangeLog     2017-07-09 17:23:09 UTC (rev 7913)
@@ -1,5 +1,11 @@
 2017-07-09  Gavin Smith  <address@hidden>
 
+       * info/nodes.c
+       (get_filename_and_nodename, info_get_node_with_defaults):
+       Merge get_filename_and_nodename into caller.
+
+2017-07-09  Gavin Smith  <address@hidden>
+
        * info/nodes.c (build_tags_and_nodes): Call 'skip_node_separator'
        in order not to start reading the tag table in the middle of an
        "Indirect:" string.

Modified: trunk/info/nodes.c
===================================================================
--- trunk/info/nodes.c  2017-07-09 15:55:59 UTC (rev 7912)
+++ trunk/info/nodes.c  2017-07-09 17:23:09 UTC (rev 7913)
@@ -842,9 +842,6 @@
 /* Functions for node creation and retrieval. */
 
 static long get_node_length (SEARCH_BINDING *binding);
-static void get_filename_and_nodename (NODE *node,
-                                      char **filename, char **nodename,
-                                      char *filename_in, char *nodename_in);
 static void node_set_body_start (NODE *node);
 static int adjust_nodestart (FILE_BUFFER *file_buffer, TAG *tag);
 
@@ -924,9 +921,23 @@
 
   info_recent_file_error = NULL;
 
-  get_filename_and_nodename (defaults, &filename, &nodename,
-                             filename_in, nodename_in);
+  filename = filename_in;
+  if (filename_in)
+    filename = xstrdup (filename_in);
+  else
+    {
+      if (defaults)
+        filename = xstrdup (defaults->fullpath);
+      else
+        filename = xstrdup ("dir");
+    }
 
+  if (nodename_in && *nodename_in)
+    nodename = xstrdup (nodename_in);
+  else
+    /* If NODENAME is not specified, it defaults to "Top". */
+    nodename = xstrdup ("Top");
+
   /* If the file to be looked up is "dir", build the contents from all of
      the "dir"s and "localdir"s found in INFOPATH. */
   if (is_dir_name (filename))
@@ -1000,34 +1011,7 @@
   return info_get_node_with_defaults (filename_in, nodename_in, 0);
 }
 
-/* Get filename and nodename of node to load using defaults from NODE.
-   Output values should be freed by caller. */
 static void
-get_filename_and_nodename (NODE *node,
-                           char **filename, char **nodename,
-                           char *filename_in, char *nodename_in)
-{
-  *filename = filename_in;
-
-  /* If FILENAME is not specified, it defaults to "dir". */
-  if (filename_in)
-    *filename = xstrdup (filename_in);
-  else
-    {
-      if (node)
-        *filename = xstrdup (node->fullpath);
-      else
-        *filename = xstrdup ("dir");
-    }
-
-  if (nodename_in && *nodename_in)
-    *nodename = xstrdup (nodename_in);
-  else
-    /* If NODENAME is not specified, it defaults to "Top". */
-    *nodename = xstrdup ("Top");
-}
-
-static void
 node_set_body_start (NODE *node)
 {
   int n = skip_node_separator (node->contents);