Rename mreadlink_with_size to areadlink_with_size.

* NEWS: Document the change.
* lib/mreadlink-with-size.c (mreadlink_with_size): Rename this to...
* lib/areadlink-with-size.c (areadlink_with_size): ...this.
* lib/mreadlink.h: Rename this to...
* lib/areadlink.h: ...this.
* modules/mreadlink-with-size: Rename this to...
* modules/areadlink-with-size: ...this.
* lib/canonicalize.c: Reflect the renaming.
* modules/canonicalize: Likewise.

7 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 82b2a848bc..01d182e54b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-28  Jim Meyering  <jim@meyering.net>
+
+	Rename mreadlink_with_size to areadlink_with_size.
+	* NEWS: Document the change.
+	* lib/mreadlink-with-size.c (mreadlink_with_size): Rename this to...
+	* lib/areadlink-with-size.c (areadlink_with_size): ...this.
+	* lib/mreadlink.h: Rename this to...
+	* lib/areadlink.h: ...this.
+	* modules/mreadlink-with-size: Rename this to...
+	* modules/areadlink-with-size: ...this.
+	* lib/canonicalize.c: Reflect the renaming.
+	* modules/canonicalize: Likewise.
+
 2007-08-26  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_import): When deciding which files to remove,
diff --git a/NEWS b/NEWS
index 438644ca07..34df55a375 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2007-08-28  areadlink-with-size
+                            Renamed from mreadlink-with-size.
+                            Function renamed: mreadlink_with_size ->
+                            areadlink_with_size.
+
 2007-08-22  getdelim, getline
                             The include file is changed from "getdelim.h"
                             and "getline.h" to the POSIX 200x <stdio.h>.
diff --git a/lib/mreadlink-with-size.c b/lib/areadlink-with-size.c
index e18d5c43fb..fdaab3f460 100644
--- a/lib/mreadlink-with-size.c
+++ b/lib/areadlink-with-size.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "mreadlink.h"
+#include "areadlink.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -55,7 +55,7 @@
    than SSIZE_MAX, return NULL (caller may use errno to diagnose).  */
 
 char *
-mreadlink_with_size (char const *file, size_t size)
+areadlink_with_size (char const *file, size_t size)
 {
   /* Some buggy file systems report garbage in st_size.  Defend
      against them by ignoring outlandish st_size values in the initial
diff --git a/lib/mreadlink.h b/lib/areadlink.h
index 28d3eec9e0..e2baa6b31f 100644
--- a/lib/mreadlink.h
+++ b/lib/areadlink.h
@@ -21,4 +21,4 @@
 
 #include <stddef.h>
 
-extern char *mreadlink_with_size (char const *filename, size_t size_hint);
+extern char *areadlink_with_size (char const *filename, size_t size_hint);
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index eed7f40a83..fa2c1ab944 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -47,7 +47,7 @@
 #endif
 
 #include "pathmax.h"
-#include "mreadlink.h"
+#include "areadlink.h"
 
 #if !HAVE_CANONICALIZE_FILE_NAME
 /* Return the canonical absolute name of file NAME.  A canonical name
@@ -246,7 +246,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode)
 		    goto error;
 		}
 
-	      buf = mreadlink_with_size (rname, st.st_size);
+	      buf = areadlink_with_size (rname, st.st_size);
 	      if (!buf)
 		{
 		  if (can_mode == CAN_MISSING && errno != ENOMEM)
diff --git a/modules/mreadlink-with-size b/modules/areadlink-with-size
index 70c88e731f..df6db33b0a 100644
--- a/modules/mreadlink-with-size
+++ b/modules/areadlink-with-size
@@ -2,8 +2,8 @@ Description:
 Return the contents of a symbolic link, without size limitations.
 
 Files:
-lib/mreadlink.h
-lib/mreadlink-with-size.c
+lib/areadlink.h
+lib/areadlink-with-size.c
 
 Depends-on:
 readlink
@@ -13,10 +13,10 @@ unistd
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += mreadlink-with-size.c
+lib_SOURCES += areadlink-with-size.c
 
 Include:
-"mreadlink.h"
+"areadlink.h"
 
 License:
 GPL
diff --git a/modules/canonicalize b/modules/canonicalize
index cb135daf8a..52e80fbcbe 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -13,7 +13,7 @@ filenamecat
 sys_stat
 xalloc
 xgetcwd
-mreadlink-with-size
+areadlink-with-size
 
 configure.ac:
 AC_FUNC_CANONICALIZE_FILE_NAME