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

error.c: warning_string

Browse Source 
* error.c (warning_string): extract a method to create warning
  message string.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-06 08:37:19 +00:00
parent 9f9034bba1
commit ae2d32304b
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
error.c
View File

@ -198,10 +198,10 @@ rb_compile_warning(const char *file, int line, const char *fmt, ...)
va_end(args); va_end(args);
} }
static void static VALUE
warn_print(const char *fmt, va_list args) warning_string(rb_encoding *enc, const char *fmt, va_list args)
{ {
VALUE str = rb_str_new(0, 0); VALUE str = rb_enc_str_new(0, 0, enc);
VALUE file = rb_sourcefilename(); VALUE file = rb_sourcefilename();
if (!NIL_P(file)) { if (!NIL_P(file)) {
@ -214,32 +214,36 @@ warn_print(const char *fmt, va_list args)
rb_str_cat2(str, "warning: "); rb_str_cat2(str, "warning: ");
rb_str_vcatf(str, fmt, args); rb_str_vcatf(str, fmt, args);
rb_str_cat2(str, "\n"); rb_str_cat2(str, "\n");
rb_write_error_str(str); return str;
} }
void void
rb_warn(const char *fmt, ...) rb_warn(const char *fmt, ...)
{ {
VALUE mesg;
va_list args; va_list args;
if (NIL_P(ruby_verbose)) return; if (NIL_P(ruby_verbose)) return;
va_start(args, fmt); va_start(args, fmt);
warn_print(fmt, args); mesg = warning_string(0, fmt, args);
va_end(args); va_end(args);
rb_write_error_str(mesg);
} }
/* rb_warning() reports only in verbose mode */ /* rb_warning() reports only in verbose mode */
void void
rb_warning(const char *fmt, ...) rb_warning(const char *fmt, ...)
{ {
VALUE mesg;
va_list args; va_list args;
if (!RTEST(ruby_verbose)) return; if (!RTEST(ruby_verbose)) return;
va_start(args, fmt); va_start(args, fmt);
warn_print(fmt, args); mesg = warning_string(0, fmt, args);
va_end(args); va_end(args);
rb_write_error_str(mesg);
} }
/* /*
@ -2088,7 +2092,7 @@ rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
void void
rb_sys_warning(const char *fmt, ...) rb_sys_warning(const char *fmt, ...)
{ {
char buf[BUFSIZ]; VALUE mesg;
va_list args; va_list args;
int errno_save; int errno_save;
@ -2096,11 +2100,12 @@ rb_sys_warning(const char *fmt, ...)
if (!RTEST(ruby_verbose)) return; if (!RTEST(ruby_verbose)) return;
snprintf(buf, BUFSIZ, "%s: %s", fmt, strerror(errno_save));
va_start(args, fmt); va_start(args, fmt);
warn_print(buf, args); mesg = warning_string(0, fmt, args);
va_end(args); va_end(args);
rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
rb_str_catf(mesg, ": %s\n", strerror(errno_save));
rb_write_error_str(mesg);
errno = errno_save; errno = errno_save;
} }