aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--stdlib/tst-environ.c5
-rw-r--r--timezone/test-tz.c12
3 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8204a31f1e..e7cb403c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-30 Ulrich Drepper <drepper@cygnus.com>
+
+ * stdlib/tst-environ.c: Add cast to avoid warning.
+ * timezone/test-tz.c: Use setenv instead of putenv.
+
1999-08-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/libc.texinfo: Update version and date.
diff --git a/stdlib/tst-environ.c b/stdlib/tst-environ.c
index 01083f5511..4d17634b52 100644
--- a/stdlib/tst-environ.c
+++ b/stdlib/tst-environ.c
@@ -127,8 +127,9 @@ main (void)
}
/* More fun ahead: we are now removing the variable. This should remove
- both values. */
- putenv (VAR);
+ both values. The cast is ok: this call should never put the string
+ in the environment and it should never modify it. */
+ putenv ((char *) VAR);
/* Getting the value should now fail. */
if (getenv (VAR) != NULL)
diff --git a/timezone/test-tz.c b/timezone/test-tz.c
index 6a330a5021..28e1e37010 100644
--- a/timezone/test-tz.c
+++ b/timezone/test-tz.c
@@ -7,11 +7,11 @@ struct {
const char * env;
time_t expected;
} tests[] = {
- {"TZ=MST", 832935315},
- {"TZ=", 832910115},
- {"TZ=:UTC", 832910115},
- {"TZ=UTC", 832910115},
- {"TZ=UTC0", 832910115}
+ {"MST", 832935315},
+ {"", 832910115},
+ {":UTC", 832910115},
+ {"UTC", 832910115},
+ {"UTC0", 832910115}
};
@@ -34,7 +34,7 @@ main (int argc, char ** argv)
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
{
- putenv (tests[i].env);
+ setenv ("TZ", tests[i].env);
t = mktime (&tm);
if (t != tests[i].expected)
{