From 63d53005745ff3ffbd2a365c12592c18bb796a89 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 8 Aug 2003 20:38:15 +0000 Subject: [PATCH] Fix syntax error in the !HAVE_SETENV case. 2003-08-08 Tor Lillqvist * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV case. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.c | 7 +++++-- 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fe837a..f689c18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3fe837a..f689c18 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3fe837a..f689c18 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3fe837a..f689c18 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3fe837a..f689c18 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3fe837a..f689c18 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-08-08 Tor Lillqvist + + * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV + case. + 2003-08-08 Matthias Clasen * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS diff --git a/glib/gutils.c b/glib/gutils.c index 18ef828..c98f362 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -716,12 +716,15 @@ g_setenv (const gchar *variable, gboolean overwrite) { gint result; +#ifndef HAVE_SETENV + gchar *string; +#endif + g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE); + #ifdef HAVE_SETENV result = setenv (variable, value, overwrite); #else - gchar *string; - if (!overwrite && g_getenv (variable) != NULL) return TRUE; -- 2.7.4