From 16fc3b22c0ae7ca268f34d554da4f4850748d335 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 10 Sep 2001 15:50:26 +0000 Subject: [PATCH] Doc fixes. Mon Sep 10 11:42:58 2001 Owen Taylor * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: Doc fixes. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gfileutils.c | 2 ++ glib/gmain.c | 4 ++-- glib/gstring.c | 16 ++++++++-------- glib/gutf8.c | 20 ++++++++++---------- 12 files changed, 62 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77152ea..a83c5ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 77152ea..a83c5ba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Sep 10 11:42:58 2001 Owen Taylor + + * glib/gutf8.c glib/gstring.c glib/gfileutils.c glib/gmain.c: + Doc fixes. + Sat Sep 8 17:14:51 2001 Owen Taylor * glib/gfileutils.[ch]: Add g_build_path(), diff --git a/glib/gfileutils.c b/glib/gfileutils.c index a11048a..859961b 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -763,6 +763,7 @@ g_build_pathv (const gchar *separator, * g_build_path: * @separator: a string used to separator the elements of the path. * @first_element: the first element in the path + * @Varargs: remaining elements in path * * Create a path from a series of elements using @separator as the * separator between elements. At the boundary between two elements, @@ -792,6 +793,7 @@ g_build_path (const gchar *separator, /** * g_build_filename: * @first_element: the first element in the path + * @Varargs: remaining elements in path * * Create a filename from a series of elements using the correct * separator for filenames. This function behaves identically diff --git a/glib/gmain.c b/glib/gmain.c index 2f11b1a..f5dd8ca 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -504,7 +504,7 @@ g_poll (GPollFD *fds, /** * g_main_context_ref: - * @loop: a #GMainContext + * @context: a #GMainContext * * Increases the reference count on a #GMainContext object by one. **/ @@ -569,7 +569,7 @@ g_main_context_unref_and_unlock (GMainContext *context) /** * g_main_context_unref: - * @loop: a #GMainContext + * @context: a #GMainContext * * Decreases the reference count on a #GMainContext object by one. If * the result is zero, free the context and free all associated memory. diff --git a/glib/gstring.c b/glib/gstring.c index 532275b..4041ab6 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -370,7 +370,7 @@ g_string_truncate (GString *fstring, /** * g_string_set_size: - * @fstring: a #GString + * @string: a #GString * @len: the new length * * Sets the length of a #GString. If the length is less than @@ -382,20 +382,20 @@ g_string_truncate (GString *fstring, * Return value: @fstring **/ GString* -g_string_set_size (GString *fstring, +g_string_set_size (GString *string, gsize len) { - GRealString *string = (GRealString *) fstring; + GRealString *rstring = (GRealString *) string; g_return_val_if_fail (string != NULL, NULL); - if (len >= string->allocated_len) - g_string_maybe_expand (string, len - fstring->len); + if (len >= rstring->allocated_len) + g_string_maybe_expand (rstring, len - string->len); - string->len = len; - string->str[len] = 0; + rstring->len = len; + rstring->str[len] = 0; - return fstring; + return string; } GString* diff --git a/glib/gutf8.c b/glib/gutf8.c index a858780..4efe510 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -501,7 +501,7 @@ g_unichar_to_utf8 (gunichar c, /** * g_utf8_strchr: * @p: a nul-terminated utf-8 string - * @p_len: the maximum length of p + * @len: the maximum length of p * @c: a iso-10646 character * * Find the leftmost occurence of the given iso-10646 character @@ -513,22 +513,22 @@ g_unichar_to_utf8 (gunichar c, **/ gchar * g_utf8_strchr (const char *p, - gssize p_len, + gssize len, gunichar c) { gchar ch[10]; - gint len = g_unichar_to_utf8 (c, ch); - ch[len] = '\0'; + gint charlen = g_unichar_to_utf8 (c, ch); + ch[charlen] = '\0'; - return g_strstr_len (p, p_len, ch); + return g_strstr_len (p, len, ch); } /** * g_utf8_strrchr: * @p: a nul-terminated utf-8 string - * @p_len: the maximum length of p + * @len: the maximum length of p * @c: a iso-10646 character/ * * Find the rightmost occurence of the given iso-10646 character @@ -540,15 +540,15 @@ g_utf8_strchr (const char *p, **/ gchar * g_utf8_strrchr (const char *p, - gssize p_len, + gssize len, gunichar c) { gchar ch[10]; - gint len = g_unichar_to_utf8 (c, ch); - ch[len] = '\0'; + gint charlen = g_unichar_to_utf8 (c, ch); + ch[charlen] = '\0'; - return g_strrstr_len (p, p_len, ch); + return g_strrstr_len (p, len, ch); } -- 2.7.4