Re: [libvirt] [PATCH] util: Extract locale-related fixes into separate functions

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/util/virstring.c | 96 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index feea5be05198..6125725364f3 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -522,6 +522,7 @@ virStrToLong_ullp(char const *s, char **end_ptr, int base, #if HAVE_NEWLOCALE static locale_t virLocale; +static locale_t virLocaleOld;

static int virLocaleOnceInit(void) @@ -533,7 +534,58 @@ virLocaleOnceInit(void) } VIR_ONCE_GLOBAL_INIT(virLocale); -#endif + +static int +virLocaleSet(void) +{ + if (virLocaleInitialize() < 0) + return -1; + virLocaleOld = uselocale(virLocale);

+ return 0; +} + +static void +virLocaleRevert(void) +{ + uselocale(virLocaleOld);