changed names of ?cvt : namespace problems
This commit is contained in:
parent
239d634ab1
commit
ccd728edbc
5 changed files with 10 additions and 10 deletions
|
@ -131,7 +131,7 @@ f_print(va_list *ap, int flags, char *s, char c, int precision)
|
||||||
break;
|
break;
|
||||||
case 'g':
|
case 'g':
|
||||||
case 'G':
|
case 'G':
|
||||||
s = gcvt(ld_val, precision, s, flags) + strlen(s);
|
s = _gcvt(ld_val, precision, s, flags) + strlen(s);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if ( c == 'E' || c == 'G') {
|
if ( c == 'E' || c == 'G') {
|
||||||
|
|
|
@ -16,14 +16,14 @@ cvt(long double value, int ndigit, int *decpt, int *sign, int ecvtflag)
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
ecvt(long double value, int ndigit, int *decpt, int *sign)
|
_ecvt(long double value, int ndigit, int *decpt, int *sign)
|
||||||
{
|
{
|
||||||
|
|
||||||
return cvt(value, ndigit, decpt, sign, 1);
|
return cvt(value, ndigit, decpt, sign, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
fcvt(long double value, int ndigit, int *decpt, int *sign)
|
_fcvt(long double value, int ndigit, int *decpt, int *sign)
|
||||||
{
|
{
|
||||||
return cvt(value, ndigit, decpt, sign, 0);
|
return cvt(value, ndigit, decpt, sign, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ _pfloat(long double r, register char *s, int n, int flags)
|
||||||
int sign, dp;
|
int sign, dp;
|
||||||
register int i;
|
register int i;
|
||||||
|
|
||||||
s1 = fcvt(r, n, &dp, &sign);
|
s1 = _fcvt(r, n, &dp, &sign);
|
||||||
if (sign)
|
if (sign)
|
||||||
*s++ = '-';
|
*s++ = '-';
|
||||||
else if (flags & FL_SIGN)
|
else if (flags & FL_SIGN)
|
||||||
|
@ -45,7 +45,7 @@ _pscien(long double r, register char *s, int n, int flags)
|
||||||
int sign, dp;
|
int sign, dp;
|
||||||
register char *s1;
|
register char *s1;
|
||||||
|
|
||||||
s1 = ecvt(r, n + 1, &dp, &sign);
|
s1 = _ecvt(r, n + 1, &dp, &sign);
|
||||||
if (sign)
|
if (sign)
|
||||||
*s++ = '-';
|
*s++ = '-';
|
||||||
else if (flags & FL_SIGN)
|
else if (flags & FL_SIGN)
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
#define USE_EXP(exp, ndigits) (((exp) < LOW_EXP + 1) || (exp >= ndigits + 1))
|
#define USE_EXP(exp, ndigits) (((exp) < LOW_EXP + 1) || (exp >= ndigits + 1))
|
||||||
|
|
||||||
char *
|
char *
|
||||||
gcvt(long double value, int ndigit, char *s, int flags)
|
_gcvt(long double value, int ndigit, char *s, int flags)
|
||||||
{
|
{
|
||||||
int sign, dp;
|
int sign, dp;
|
||||||
register char *s1, *s2;
|
register char *s1, *s2;
|
||||||
register int i;
|
register int i;
|
||||||
register int nndigit = ndigit;
|
register int nndigit = ndigit;
|
||||||
|
|
||||||
s1 = ecvt(value, ndigit, &dp, &sign);
|
s1 = _ecvt(value, ndigit, &dp, &sign);
|
||||||
s2 = s;
|
s2 = s;
|
||||||
if (sign) *s2++ = '-';
|
if (sign) *s2++ = '-';
|
||||||
else if (flags & FL_SIGN)
|
else if (flags & FL_SIGN)
|
||||||
|
|
|
@ -20,9 +20,9 @@ FILE *fdopen(int fd, const char *mode);
|
||||||
#ifndef NOFLOAT
|
#ifndef NOFLOAT
|
||||||
char *_pfloat(long double r, register char *s, int n, int flags);
|
char *_pfloat(long double r, register char *s, int n, int flags);
|
||||||
char *_pscien(long double r, register char *s, int n, int flags);
|
char *_pscien(long double r, register char *s, int n, int flags);
|
||||||
char *ecvt(long double value, int ndigit, int *decpt, int *sign);
|
char *_ecvt(long double value, int ndigit, int *decpt, int *sign);
|
||||||
char *fcvt(long double value, int ndigit, int *decpt, int *sign);
|
char *_fcvt(long double value, int ndigit, int *decpt, int *sign);
|
||||||
char *gcvt(long double value, int ndigit, char *s, int flags);
|
char *_gcvt(long double value, int ndigit, char *s, int flags);
|
||||||
#endif /* NOFLOAT */
|
#endif /* NOFLOAT */
|
||||||
|
|
||||||
#define FL_LJUST 0x0001 /* left-justify field */
|
#define FL_LJUST 0x0001 /* left-justify field */
|
||||||
|
|
Loading…
Reference in a new issue