projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df82f8f
)
add strfmon_l variant (still mostly incomplete)
author
Rich Felker
<dalias@aerifal.cx>
Sun, 25 Mar 2012 04:21:20 +0000
(
00:21
-0400)
committer
Rich Felker
<dalias@aerifal.cx>
Sun, 25 Mar 2012 04:21:20 +0000
(
00:21
-0400)
src/locale/strfmon.c
patch
|
blob
|
history
diff --git
a/src/locale/strfmon.c
b/src/locale/strfmon.c
index
66bee48
..
81dfe38
100644
(file)
--- a/
src/locale/strfmon.c
+++ b/
src/locale/strfmon.c
@@
-3,16
+3,15
@@
#include <stdarg.h>
#include <monetary.h>
#include <errno.h>
#include <stdarg.h>
#include <monetary.h>
#include <errno.h>
+#include <stdarg.h>
-s
size_t strfmon(char *s, size_t n, const char *fmt, ...
)
+s
tatic 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;
{
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:
for (; n && *fmt; ) {
if (*fmt != '%') {
literal:
@@
-75,3
+74,28
@@
ssize_t strfmon(char *s, size_t n, const char *fmt, ...)
}
return s-s0;
}
}
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;
+}