1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sprintf.c: ruby_ultoa

Browse Source 
* sprintf.c (ruby_ultoa): prefixed to get rid of conflict with
  a MSVC library function.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-28 05:08:44 +00:00
parent fb7c7d1e79
commit efdc6d78ac
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sprintf.c
View File

@ -24,7 +24,7 @@
#define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */ #define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */
static char *fmt_setup(char*,size_t,int,int,int,int); static char *fmt_setup(char*,size_t,int,int,int,int);
static char *ultoa(unsigned long val, char *endp, int base, int octzero); static char *ruby_ultoa(unsigned long val, char *endp, int base, int octzero);
static char static char
sign_bits(int base, const char *p) sign_bits(int base, const char *p)
@ -939,7 +939,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
sc = ' '; sc = ' ';
width--; width--;
} }
s = ultoa((unsigned long)v, nbuf + sizeof(nbuf), 10, 0); s = ruby_ultoa((unsigned long)v, nbuf + sizeof(nbuf), 10, 0);
len = (int)(nbuf + sizeof(nbuf) - s); len = (int)(nbuf + sizeof(nbuf) - s);
} }
else { else {
@ -1200,12 +1200,12 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
*--buf = c; *--buf = c;
if (flags & FPREC) { if (flags & FPREC) {
buf = ultoa(prec, buf, 10, 0); buf = ruby_ultoa(prec, buf, 10, 0);
*--buf = '.'; *--buf = '.';
} }
if (flags & FWIDTH) { if (flags & FWIDTH) {
buf = ultoa(width, buf, 10, 0); buf = ruby_ultoa(width, buf, 10, 0);
} }
if (flags & FSPACE) *--buf = ' '; if (flags & FSPACE) *--buf = ' ';
@ -1248,7 +1248,7 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
#include "vsnprintf.c" #include "vsnprintf.c"
static char * static char *
ultoa(unsigned long val, char *endp, int base, int flags) ruby_ultoa(unsigned long val, char *endp, int base, int flags)
{ {
const char *xdigs = lower_hexdigits; const char *xdigs = lower_hexdigits;
int octzero = flags & FSHARP; int octzero = flags & FSHARP;