diff --git a/ChangeLog b/ChangeLog index 106f6811c..5fb149341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 106f6811c..5fb149341 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 106f6811c..5fb149341 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 106f6811c..5fb149341 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 106f6811c..5fb149341 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 106f6811c..5fb149341 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-07-30 Matthias Clasen + + * 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 * glib/gqsort.[hc] (g_qsort_with_data): diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index a934da1be..200706637 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +2003-07-30 Matthias Clasen + + * glib/glib-sections.txt: Rename g_read_link to g_file_read_link. + 2003-07-29 Matthias Clasen * 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 0e5ef3534..187356752 100644 --- 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 GDir diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 8fdd0ec98..121d81b56 100644 --- 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 0649580e8..e6d12f276 100644 --- 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() */