From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 7 Oct 2011 13:49:17 +0000 (+0200)
Subject: refactor: rename a subroutine to a more proper name
X-Git-Tag: ng-0.5a~89^2~27^2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6571c2fd4e7eca643f7d994efad52a4120118ccc;p=thirdparty%2Fautomake.git

refactor: rename a subroutine to a more proper name

* automake.in (maybe_push_require_file): Renamed ...
(push_required_file): ... to this.
All callers adjusted.
---

diff --git a/ChangeLog b/ChangeLog
index 524423779..aff4d068d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	refactor: rename a subroutine to a more proper name
+	* automake.in (maybe_push_require_file): Renamed ...
+	(push_required_file): ... to this.
+	All callers adjusted.
+
 2011-10-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	dist: truly always distribute files in AC_REQUIRE_AUX_FILE
diff --git a/automake.in b/automake.in
index 9159fc6c2..951d5c7c0 100644
--- a/automake.in
+++ b/automake.in
@@ -5551,7 +5551,7 @@ sub scan_autoconf_files ()
   # Look for some files we need.  Always check for these.  This
   # check must be done for every run, even those where we are only
   # looking at a subdir Makefile.  We must set relative_dir for
-  # maybe_push_required_file to work.
+  # push_required_file to work.
   # Sort the files for stable verbose output.
   $relative_dir = '.';
   foreach my $file (sort keys %required_aux_file)
@@ -7578,10 +7578,10 @@ sub locate_aux_dir ()
 }
 
 
-# &maybe_push_required_file ($DIR, $FILE, $FULLFILE)
+# &push_required_file ($DIR, $FILE, $FULLFILE)
 # --------------------------------------------------
 # Push the given file onto DIST_COMMON.
-sub maybe_push_required_file
+sub push_required_file
 {
   my ($dir, $file, $fullfile) = @_;
 
@@ -7687,7 +7687,7 @@ sub require_file_internal ($$$@)
       elsif (dir_has_case_matching_file ($dir, $file))
 	{
 	  $found_it = 1;
-	  maybe_push_required_file ($dir, $file, $fullfile);
+	  push_required_file ($dir, $file, $fullfile);
 	}
 
       # `--force-missing' only has an effect if `--add-missing' is
@@ -7763,7 +7763,7 @@ sub require_file_internal ($$$@)
 			}
 		      set_dir_cache_file ($dir, $file);
 		    }
-		  maybe_push_required_file ($dir, $file, $fullfile);
+		  push_required_file ($dir, $file, $fullfile);
 		}
 	      else
 		{
@@ -7883,7 +7883,7 @@ sub require_queued_conf_file ($)
 # worker threads may queue up the action to be serialized by the master.
 #
 # FIXME: this seriously relies on the semantics of require_file_internal
-# and maybe_push_required_file, in that we exploit the fact that only the
+# and push_required_file, in that we exploit the fact that only the
 # contents of the last handled output file may be impacted (which in turn
 # is dealt with by the master thread).
 sub require_conf_file ($$@)