From f23e5ee26d14b7931c65e5df0bf46ff356c6177b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Mar 2008 11:22:19 +0000 Subject: Updated to fedora-glibc-20080326T1041 --- intl/bindtextdom.c | 3 +-- intl/loadmsgcat.c | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'intl') diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index fd527a180a..7a956d4471 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -203,8 +203,7 @@ set_binding_values (domainname, dirnamep, codesetp) if (__builtin_expect (result != NULL, 1)) { - if (binding->codeset != NULL) - free (binding->codeset); + free (binding->codeset); binding->codeset = result; modified = 1; diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 537fd6013c..3cba7b1491 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -1236,8 +1236,7 @@ _nl_load_domain (domain_file, domainbinding) /* This is an invalid revision. */ invalid: /* This is an invalid .mo file. */ - if (domain->malloced) - free (domain->malloced); + free (domain->malloced); #ifdef HAVE_MMAP if (use_mmap) munmap ((caddr_t) data, size); @@ -1289,12 +1288,10 @@ _nl_unload_domain (domain) if (convd->conv != (__gconv_t) -1) __gconv_close (convd->conv); } - if (domain->conversions != NULL) - free (domain->conversions); + free (domain->conversions); __libc_rwlock_fini (domain->conversions_lock); - if (domain->malloced) - free (domain->malloced); + free (domain->malloced); # ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) -- cgit v1.2.3