Rename g_read_link() to g_file_read_link() to better match the remaining

	* glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
	utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem
	as the function is just 2 days old.

diff --git a/ChangeLog b/ChangeLog
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 106f6811c814ada26e59848d728dd4d9c746556b..5fb149341c7d7b853bff9373fcf92e16d92b3989 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gfileutils.[hc]: Rename g_read_link() to g_file_read_link() to better match the remaining file
+       utilities in the g_file_ namespace and to better separate it from readlink(). This is hopefully no problem 
+       as the function is just 2 days old.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gqsort.[hc] (g_qsort_with_data): 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a934da1beb2b3a7b2d1772bb11806602ce67b7ff..20070663759fa0f33a3fe0838ed776465cb7c6ee 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-30  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/glib-sections.txt: Rename g_read_link to g_file_read_link.
+
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/tmpl/macros_misc.sgml: Document G_GINT{16,32,64}_MODIFIER, add note about scanning.

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 0e5ef3534be37c39761fc6ee3482f7171db34b46..187356752ab9a26dcbcf71b3d0c7cc030827122a 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -878,7 +878,7 @@ g_file_get_contents
 g_file_test
 g_mkstemp
 g_file_open_tmp
-g_read_link
+g_file_read_link
 
 <SUBSECTION>
 GDir

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 8fdd0ec98c9ddda2e484c8b33182d1cd9a892d6b..121d81b56d1fd75bc1e90583fa77aadf09928d8a 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -988,7 +988,7 @@ g_build_filename (const gchar *first_element,
 }
 
 /**
- * g_read_link:
+ * g_file_read_link:
  * @filename: the symbolic link
  * @error: return location for a #GError
  *
@@ -1002,8 +1002,8 @@ g_build_filename (const gchar *first_element,
  * Since: 2.4
  */
 gchar *
-g_read_link (const gchar *filename,
-            GError     **error)
+g_file_read_link (const gchar *filename,
+                 GError     **error)
 {
 #ifdef HAVE_READLINK
   gchar *buffer;

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 0649580e8b00322e5a01d00fd8693188ca66a56f..e6d12f27651b56a8fcde0aca77afcb2d4cddd78b 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -78,7 +78,7 @@ gboolean g_file_get_contents (const gchar  *filename,
                               gchar       **contents,
                               gsize        *length,    
                               GError      **error);
-gchar * g_read_link          (const gchar  *filename,
+gchar   *g_file_read_link    (const gchar  *filename,
                              GError      **error);
 
 /* Wrapper / workalike for mkstemp() */