mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
This commit was generated by cvs2svn to compensate for changes in r11,
which included commits to RCS files with non-trunk default branches. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
62e41d3f2e
commit
7ea2ceddb8
79 changed files with 8922 additions and 8253 deletions
12
sprintf.c
12
sprintf.c
|
@ -109,7 +109,7 @@ f_sprintf(argc, argv)
|
|||
int argc;
|
||||
VALUE *argv;
|
||||
{
|
||||
struct RString *fmt;
|
||||
VALUE fmt;
|
||||
char *buf, *p, *end;
|
||||
int blen, bsiz;
|
||||
VALUE result;
|
||||
|
@ -122,7 +122,7 @@ f_sprintf(argc, argv)
|
|||
#define FWIDTH 16
|
||||
#define FPREC 32
|
||||
|
||||
int width, prec, flags = FNONE;
|
||||
int width = 0, prec = 0, flags = FNONE;
|
||||
VALUE str;
|
||||
|
||||
|
||||
|
@ -142,15 +142,15 @@ f_sprintf(argc, argv)
|
|||
#define GETARG() \
|
||||
((argc == 0)?(ArgError("too few argument."),0):(argc--,((argv++)[0])))
|
||||
|
||||
fmt = (struct RString*)GETARG();
|
||||
fmt = GETARG();
|
||||
Check_Type(fmt, T_STRING);
|
||||
|
||||
blen = 0;
|
||||
bsiz = 120;
|
||||
buf = ALLOC_N(char, bsiz);
|
||||
end = fmt->ptr + fmt->len;
|
||||
end = RSTRING(fmt)->ptr + RSTRING(fmt)->len;
|
||||
|
||||
for (p = fmt->ptr; p < end; p++) {
|
||||
for (p = RSTRING(fmt)->ptr; p < end; p++) {
|
||||
char *t;
|
||||
|
||||
for (t = p; t < end && *t != '%'; t++) ;
|
||||
|
@ -597,7 +597,7 @@ f_sprintf(argc, argv)
|
|||
}
|
||||
|
||||
sprint_exit:
|
||||
if (verbose && argc > 1) {
|
||||
if (RTEST(verbose) && argc > 1) {
|
||||
ArgError("too many argument for format string");
|
||||
}
|
||||
result = str_new(buf, blen);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue