aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-05-23 10:08:18 +0200
committerFlorian Weimer <fweimer@redhat.com>2022-05-23 11:06:31 +0200
commitbbebe83a2874cd25934046d908824dfc11711a2b (patch)
tree1e4b6818e4fc8c35996da79471d55048095f7650 /time
parent0b6342e769be6903f29da067f5cbcbfcc7c01b10 (diff)
downloadglibc-bbebe83a2874cd25934046d908824dfc11711a2b.zip
glibc-bbebe83a2874cd25934046d908824dfc11711a2b.tar.gz
glibc-bbebe83a2874cd25934046d908824dfc11711a2b.tar.bz2
locale: Remove cleanup function pointer from struct __localedata
We can call the cleanup functions directly from _nl_unload_locale if we pass the category to it. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'time')
-rw-r--r--time/alt_digit.c2
-rw-r--r--time/era.c1
-rw-r--r--time/lc-time-cleanup.c1
3 files changed, 0 insertions, 4 deletions
diff --git a/time/alt_digit.c b/time/alt_digit.c
index ae22b3f..7ed9b6b 100644
--- a/time/alt_digit.c
+++ b/time/alt_digit.c
@@ -41,7 +41,6 @@ _nl_init_alt_digit (struct __locale_data *current)
if (current->private.time == NULL)
return;
memset (current->private.time, 0, sizeof *current->private.time);
- current->private.cleanup = &_nl_cleanup_time;
}
data = current->private.time;
@@ -110,7 +109,6 @@ _nl_get_walt_digit (unsigned int number, struct __locale_data *current)
if (current->private.time == NULL)
goto out;
memset (current->private.time, 0, sizeof *current->private.time);
- current->private.cleanup = &_nl_cleanup_time;
}
data = current->private.time;
diff --git a/time/era.c b/time/era.c
index 43528ad..d4b538c 100644
--- a/time/era.c
+++ b/time/era.c
@@ -53,7 +53,6 @@ _nl_init_era_entries (struct __locale_data *current)
if (current->private.time == NULL)
goto out;
memset (current->private.time, 0, sizeof *current->private.time);
- current->private.cleanup = &_nl_cleanup_time;
}
data = current->private.time;
diff --git a/time/lc-time-cleanup.c b/time/lc-time-cleanup.c
index 2734e25..f844e04 100644
--- a/time/lc-time-cleanup.c
+++ b/time/lc-time-cleanup.c
@@ -26,7 +26,6 @@ _nl_cleanup_time (struct __locale_data *locale)
if (data != NULL)
{
locale->private.time = NULL;
- locale->private.cleanup = NULL;
free (data->eras);
free (data->alt_digits);