summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-03-26 11:22:19 +0000
committerJakub Jelinek <jakub@redhat.com>2008-03-26 11:22:19 +0000
commitf23e5ee26d14b7931c65e5df0bf46ff356c6177b (patch)
tree7ec5160f8a03894ed0f4be9a1c312ed5bffdc7e5 /time
parentd0b6ac6c5023a223e150c49c422c7ad2bd99456c (diff)
Updated to fedora-glibc-20080326T1041cvs/fedora-glibc-2_7_90-12
Diffstat (limited to 'time')
-rw-r--r--time/lc-time-cleanup.c9
-rw-r--r--time/tzset.c3
2 files changed, 4 insertions, 8 deletions
diff --git a/time/lc-time-cleanup.c b/time/lc-time-cleanup.c
index 7972700686..6777f487a2 100644
--- a/time/lc-time-cleanup.c
+++ b/time/lc-time-cleanup.c
@@ -29,12 +29,9 @@ _nl_cleanup_time (struct locale_data *locale)
locale->private.time = NULL;
locale->private.cleanup = NULL;
- if (data->eras != NULL)
- free (data->eras);
- if (data->alt_digits != NULL)
- free (data->alt_digits);
- if (data->walt_digits != NULL)
- free (data->walt_digits);
+ free (data->eras);
+ free (data->alt_digits);
+ free (data->walt_digits);
free (data);
}
diff --git a/time/tzset.c b/time/tzset.c
index 0d54202185..a6fed4abc1 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -414,8 +414,7 @@ tzset_internal (always, explicit)
tz_rules[1].name = NULL;
/* Save the value of `tz'. */
- if (old_tz != NULL)
- free (old_tz);
+ free (old_tz);
old_tz = tz ? __strdup (tz) : NULL;
/* Try to read a data file. */