From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 12 Apr 2006 15:38:27 +0000 (+0000)
Subject: Add an assert to make it clear when value can be NULL.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=75ed18d067ba1434dcf06bd81b65f0066dbc8d3f;p=dana%2Fcg-glib.git

Add an assert to make it clear when value can be NULL.

2006-04-12  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Add an assert to make it
	clear when value can be NULL.
---

diff --git a/ChangeLog b/ChangeLog
index b9e5e78e..0ef48fc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Add an assert to make it
+	clear when value can be NULL.
+
 2006-04-07  Martyn Russell  <martyn@imendio.com>
 
 	* tests/threadpool-test.c: (test_thread_stop_unused): Removed an
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b9e5e78e..0ef48fc8 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Add an assert to make it
+	clear when value can be NULL.
+
 2006-04-07  Martyn Russell  <martyn@imendio.com>
 
 	* tests/threadpool-test.c: (test_thread_stop_unused): Removed an
diff --git a/glib/goption.c b/glib/goption.c
index f85c8f5a..446b6e3b 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -767,7 +767,9 @@ parse_arg (GOptionContext *context,
      
 {
   Change *change;
-  
+
+  g_assert (value || OPTIONAL_ARG (entry) || NO_ARG (entry));
+
   switch (entry->arg)
     {
     case G_OPTION_ARG_NONE: