[glib] docs: Improve g_variant_loop() docs
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] docs: Improve g_variant_loop() docs
- Date: Mon, 7 Nov 2011 14:30:38 +0000 (UTC)
commit 7d1c7af1a6ed30d4caec244ac8ebe47dc86bf04f
Author: Benjamin Otte <otte redhat com>
Date: Sun Oct 16 12:58:29 2011 -0700
docs: Improve g_variant_loop() docs
Typo fix and changing "is not recommended" to the nice version of "don't
do this", aka "causes undefined behavior".
gio/glocalfileinfo.c | 5 ++++-
glib/gvariant.c | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index c12d133..f3cefe4 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1439,7 +1439,10 @@ _g_local_file_info_get (const char *basename,
/* Avoid stat in trivial case */
if (attribute_matcher == NULL)
- return info;
+ {
+ g_file_info_unset_attribute_mask (info);
+ return info;
+ }
#ifndef G_OS_WIN32
res = g_lstat (path, &statbuf);
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 379933c..c6932fd 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -4778,7 +4778,7 @@ g_variant_iter_next (GVariantIter *iter,
* @iter: a #GVariantIter
* @format_string: a GVariant format string
* @...: the arguments to unpack the value into
- * @returns: %TRUE if a value was unpacked, or %FALSE if there as no
+ * @returns: %TRUE if a value was unpacked, or %FALSE if there was no
* value
*
* Gets the next item in the container and unpacks it into the variable
@@ -4799,7 +4799,7 @@ g_variant_iter_next (GVariantIter *iter,
* function with a string constant for the format string and the same
* string constant must be used each time. Mixing calls to this
* function and g_variant_iter_next() or g_variant_iter_next_value() on
- * the same iterator is not recommended.
+ * the same iterator causes undefined behavior.
*
* See the section on <link linkend='gvariant-format-strings'>GVariant
* Format Strings</link>.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]