From 6e4c40baacfd7eaf1578f707759d79b5d95d626c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 9 Sep 1998 11:53:19 +0000 Subject: Update. 1998-09-09 09:32 Ulrich Drepper * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function inline. 1998-09-07 Paul Eggert * time/mktime.c (__EXTENSIONS__): Define if not defined. (_REENTRANT): Remove. It has undesirable consequences in Solaris 2.6 (e.g. it turns off the putc macro). Defining __EXTENSIONS__ makes localtime_r and gmtime_r visible, which is what we want. * time/strftime.c: Likewise. 1998-09-08 Andreas Schwab * elf/dl-error.c: Fix spelling. 1998-09-08 Andreas Schwab * stdlib/strfmon.c: Quiet -Wparentheses warnings. * stdio-common/_itoa.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfscanf.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/glob.c: Likewise. * posix/getopt.c: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * posix/wordexp.c: Likewise. * io/ftw.c: Likewise. * io/fts.c: Likewise. * misc/getpass.c: Likewise. * iconv/gconv_conf.c: Likewise. * argp/argp-fmtstream.c: Likewise. * argp/argp-help.c: Likewise. * elf/dl-load.c: Likewise. * locale/programs/stringtrans.c: Likewise. * catgets/gencat.c: Likewise. * posix/getconf.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/iconv_prog.c: Likewise. * string/strcoll.c: Optimize a few expressions. * string/strxfrm.c: Likewise. 1998-09-08 Andreas Schwab * elf/dl-open.c (dl_open_worker): Move decl of new_global up one level to avoid uninit variable warning. 1998-09-09 10:34 Andreas Schwab instead of _dl_default_scope[2] as argument to _dl_init_next. Fix compatibility problems introduced in last change. --- stdlib/strfmon.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'stdlib') diff --git a/stdlib/strfmon.c b/stdlib/strfmon.c index e1ff401e72..187e33fe37 100644 --- a/stdlib/strfmon.c +++ b/stdlib/strfmon.c @@ -296,18 +296,22 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...) case 'i': /* Use international currency symbol. */ currency_symbol = _NL_CURRENT (LC_MONETARY, INT_CURR_SYMBOL); if (right_prec == -1) - if (*_NL_CURRENT (LC_MONETARY, INT_FRAC_DIGITS) == CHAR_MAX) - right_prec = 2; - else - right_prec = *_NL_CURRENT (LC_MONETARY, INT_FRAC_DIGITS); + { + if (*_NL_CURRENT (LC_MONETARY, INT_FRAC_DIGITS) == CHAR_MAX) + right_prec = 2; + else + right_prec = *_NL_CURRENT (LC_MONETARY, INT_FRAC_DIGITS); + } break; case 'n': /* Use national currency symbol. */ currency_symbol = _NL_CURRENT (LC_MONETARY, CURRENCY_SYMBOL); if (right_prec == -1) - if (*_NL_CURRENT (LC_MONETARY, FRAC_DIGITS) == CHAR_MAX) - right_prec = 2; - else - right_prec = *_NL_CURRENT (LC_MONETARY, FRAC_DIGITS); + { + if (*_NL_CURRENT (LC_MONETARY, FRAC_DIGITS) == CHAR_MAX) + right_prec = 2; + else + right_prec = *_NL_CURRENT (LC_MONETARY, FRAC_DIGITS); + } break; default: /* Any unrecognized format is an error. */ __set_errno (EINVAL); @@ -493,24 +497,26 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...) /* Now test whether the output width is filled. */ if (dest - startp < width) - if (left) - /* We simply have to fill using spaces. */ - do - out_char (' '); - while (dest - startp < width); - else - { - int dist = width - (dest - startp); - char *cp; - for (cp = dest - 1; cp >= startp; --cp) - cp[dist] = cp[0]; + { + if (left) + /* We simply have to fill using spaces. */ + do + out_char (' '); + while (dest - startp < width); + else + { + int dist = width - (dest - startp); + char *cp; + for (cp = dest - 1; cp >= startp; --cp) + cp[dist] = cp[0]; - dest += dist; + dest += dist; - do - startp[--dist] = ' '; - while (dist > 0); - } + do + startp[--dist] = ' '; + while (dist > 0); + } + } } /* Terminate the string. */ -- cgit v1.2.3