mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
1998-09-09 09:32 Ulrich Drepper <drepper@cygnus.com> * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function inline. 1998-09-07 Paul Eggert <eggert@twinsun.com> * 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 <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c: Fix spelling. 1998-09-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * 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 <schwab@issan.informatik.uni-dortmund.de> * 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 <schwab@issan.informatik.uni-dortmund.de> instead of _dl_default_scope[2] as argument to _dl_init_next. Fix compatibility problems introduced in last change.
This commit is contained in:
@ -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];
|
||||
|
||||
dest += dist;
|
||||
|
||||
{
|
||||
if (left)
|
||||
/* We simply have to fill using spaces. */
|
||||
do
|
||||
startp[--dist] = ' ';
|
||||
while (dist > 0);
|
||||
}
|
||||
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;
|
||||
|
||||
do
|
||||
startp[--dist] = ' ';
|
||||
while (dist > 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Terminate the string. */
|
||||
|
Reference in New Issue
Block a user