From bff650df9f1f6a0da80d8894535a41b0a2cca320 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 25 Mar 2012 00:21:20 -0400 Subject: [PATCH] add strfmon_l variant (still mostly incomplete) --- src/locale/strfmon.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/locale/strfmon.c b/src/locale/strfmon.c index 66bee482..81dfe38f 100644 --- a/src/locale/strfmon.c +++ b/src/locale/strfmon.c @@ -3,16 +3,15 @@ #include #include #include +#include -ssize_t strfmon(char *s, size_t n, const char *fmt, ...) +static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_list ap) { size_t l; double x; int fill, nogrp, negpar, nosym, left, intl; int lp, rp, w, fw; char *s0=s; - va_list ap; - va_start(ap, fmt); for (; n && *fmt; ) { if (*fmt != '%') { literal: @@ -75,3 +74,28 @@ ssize_t strfmon(char *s, size_t n, const char *fmt, ...) } return s-s0; } + +ssize_t strfmon_l(char *s, size_t n, locale_t loc, const char *fmt, ...) +{ + va_list ap; + ssize_t ret; + + va_start(ap, fmt); + ret = vstrfmon_l(s, n, loc, fmt, ap); + va_end(ap); + + return ret; +} + + +ssize_t strfmon(char *s, size_t n, const char *fmt, ...) +{ + va_list ap; + ssize_t ret; + + va_start(ap, fmt); + ret = vstrfmon_l(s, n, 0, fmt, ap); + va_end(ap); + + return ret; +} -- 2.20.1