[glib] Don't assert too much
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Don't assert too much
- Date: Tue, 3 Aug 2010 14:28:45 +0000 (UTC)
commit 9b96e31968383619ff0a76212c5200022d62b23c
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Aug 1 02:07:50 2010 -0400
Don't assert too much
glib/gbookmarkfile.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 9501fd5..db2a8bc 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -1693,9 +1693,7 @@ g_bookmark_file_load_from_data (GBookmarkFile *bookmark,
gboolean retval;
g_return_val_if_fail (bookmark != NULL, FALSE);
- g_return_val_if_fail (data != NULL, FALSE);
- g_return_val_if_fail (length != 0, FALSE);
-
+
if (length == (gsize) -1)
length = strlen (data);
@@ -1704,7 +1702,7 @@ g_bookmark_file_load_from_data (GBookmarkFile *bookmark,
g_bookmark_file_clear (bookmark);
g_bookmark_file_init (bookmark);
}
-
+
parse_error = NULL;
retval = g_bookmark_file_parse (bookmark, data, length, &parse_error);
if (!retval)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]