mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

i18n: Fix gc_malloc/free mismatch on non-GNU systems.

Browse source 
* libguile/i18n.c (scm_i_locale_free): Remove.
  (smob_locale_free): Define only when USE_GNU_LOCALE_API.
  (scm_make_locale)[!USE_GNU_LOCALE_API]: Allocate
  `c_locale->locale_name' with `scm_gc_strdup', not `malloc'.
This commit is contained in:
Ludovic Courtès 2012-01-09 21:23:07 +01:00
parent 17cdda2181
commit 94a751bdcc
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/i18n.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. /* Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -196,22 +196,11 @@ typedef struct scm_locale
int category_mask; int category_mask;
} *scm_t_locale; } *scm_t_locale;
/* Free the resources used by LOCALE. */
static inline void
scm_i_locale_free (scm_t_locale locale)
{
free (locale->locale_name);
locale->locale_name = NULL;
}
#else /* USE_GNU_LOCALE_API */ #else /* USE_GNU_LOCALE_API */
/* Alias for glibc's locale type. */ /* Alias for glibc's locale type. */
typedef locale_t scm_t_locale; typedef locale_t scm_t_locale;
#define scm_i_locale_free freelocale
#endif /* USE_GNU_LOCALE_API */ #endif /* USE_GNU_LOCALE_API */
@ -244,16 +233,20 @@ SCM_GLOBAL_VARIABLE (scm_global_locale, "%global-locale");
SCM_SMOB (scm_tc16_locale_smob_type, "locale", 0); SCM_SMOB (scm_tc16_locale_smob_type, "locale", 0);
#ifdef USE_GNU_LOCALE_API
SCM_SMOB_FREE (scm_tc16_locale_smob_type, smob_locale_free, locale) SCM_SMOB_FREE (scm_tc16_locale_smob_type, smob_locale_free, locale)
{ {
scm_t_locale c_locale; scm_t_locale c_locale;
c_locale = (scm_t_locale) SCM_SMOB_DATA (locale); c_locale = (scm_t_locale) SCM_SMOB_DATA (locale);
scm_i_locale_free (c_locale); freelocale (c_locale);
return 0; return 0;
} }
#endif /* USE_GNU_LOCALE_API */
static void inline scm_locale_error (const char *, int) SCM_NORETURN; static void inline scm_locale_error (const char *, int) SCM_NORETURN;
@ -667,7 +660,8 @@ SCM_DEFINE (scm_make_locale, "make-locale", 2, 1, 0,
c_locale = scm_gc_malloc (sizeof (* c_locale), "locale"); c_locale = scm_gc_malloc (sizeof (* c_locale), "locale");
c_locale->category_mask = c_category_mask; c_locale->category_mask = c_category_mask;
c_locale->locale_name = c_locale_name; c_locale->locale_name = scm_gc_strdup (c_locale_name, "locale");
free (c_locale_name);
if (scm_is_eq (base_locale, SCM_VARIABLE_REF (scm_global_locale))) if (scm_is_eq (base_locale, SCM_VARIABLE_REF (scm_global_locale)))
{ {