From 6aad158c67c4e729d59c28c0701f07e01e41f85c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Sep 2004 04:18:40 +0000 Subject: [PATCH] =?utf8?q?Don't=20call=20g=5Fset=5Ferror=20()=20with=20a?= =?utf8?q?=20NULL=20format.=20(#153103,=20Robert=20=C3=96gren)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Mon Sep 20 00:17:37 2004 Matthias Clasen * tests/option-test.c (error_test3_post_parse): * tests/option-test.c (error_test2_post_parse): * tests/option-test.c (error_test1_post_parse): Don't call g_set_error () with a NULL format. (#153103, Robert Ögren) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ tests/option-test.c | 6 +++--- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0826a7c..6f315a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0826a7c..6f315a6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0826a7c..6f315a6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0826a7c..6f315a6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0826a7c..6f315a6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/tests/option-test.c b/tests/option-test.c index 39d6688..08a4f92 100644 --- a/tests/option-test.c +++ b/tests/option-test.c @@ -78,7 +78,7 @@ error_test1_post_parse (GOptionContext *context, g_assert (error_test1_int == 20); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; } @@ -138,7 +138,7 @@ error_test2_post_parse (GOptionContext *context, g_assert (strcmp (error_test2_string, "bar") == 0); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; } @@ -197,7 +197,7 @@ error_test3_post_parse (GOptionContext *context, g_assert (error_test3_boolean); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; } -- 2.7.4