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

error.c: refactor warning messages

Browse Source 
* error.c (with_warning_string): extract building warning message
  string from variadic arguments.

* error.c (syserr_warning): write warning message with the system
  error message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-03-27 10:44:32 +00:00
parent 2ff826eee7
commit cc8f2f857c
1 changed files with 48 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
error.c
View File

@ -200,62 +200,52 @@ warning_string(rb_encoding *enc, const char *fmt, va_list args)
fmt, args); fmt, args);
} }
#define with_warning_string(mesg, enc, fmt) \
VALUE mesg; \
va_list args; va_start(args, fmt); \
mesg = warning_string(enc, fmt, args); \
va_end(args);
void void
rb_warn(const char *fmt, ...) rb_warn(const char *fmt, ...)
{ {
VALUE mesg; if (!NIL_P(ruby_verbose)) {
va_list args; with_warning_string(mesg, 0, fmt) {
rb_write_warning_str(mesg);
if (NIL_P(ruby_verbose)) return; }
}
va_start(args, fmt);
mesg = warning_string(0, fmt, args);
va_end(args);
rb_write_warning_str(mesg);
} }
void void
rb_enc_warn(rb_encoding *enc, const char *fmt, ...) rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
{ {
VALUE mesg; if (!NIL_P(ruby_verbose)) {
va_list args; with_warning_string(mesg, enc, fmt) {
rb_write_warning_str(mesg);
if (NIL_P(ruby_verbose)) return; }
}
va_start(args, fmt);
mesg = warning_string(enc, fmt, args);
va_end(args);
rb_write_warning_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; if (RTEST(ruby_verbose)) {
va_list args; with_warning_string(mesg, 0, fmt) {
rb_write_warning_str(mesg);
if (!RTEST(ruby_verbose)) return; }
}
va_start(args, fmt);
mesg = warning_string(0, fmt, args);
va_end(args);
rb_write_warning_str(mesg);
} }
#if 0 #if 0
void void
rb_enc_warning(rb_encoding *enc, const char *fmt, ...) rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
{ {
VALUE mesg; if (RTEST(ruby_verbose)) {
va_list args; with_warning_string(mesg, enc, fmt) {
rb_write_warning_str(mesg);
if (!RTEST(ruby_verbose)) return; }
}
va_start(args, fmt);
mesg = warning_string(enc, fmt, args);
va_end(args);
rb_write_warning_str(mesg);
} }
#endif #endif
@ -2390,44 +2380,36 @@ rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
rb_exc_raise(exc); rb_exc_raise(exc);
} }
static void
syserr_warning(VALUE mesg, int err)
{
rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
rb_str_catf(mesg, ": %s\n", strerror(err));
rb_write_warning_str(mesg);
}
void void
rb_sys_warning(const char *fmt, ...) rb_sys_warning(const char *fmt, ...)
{ {
VALUE mesg; if (RTEST(ruby_verbose)) {
va_list args; int errno_save = errno;
int errno_save; with_warning_string(mesg, 0, fmt) {
syserr_warning(mesg, errno_save);
errno_save = errno; }
errno = errno_save;
if (!RTEST(ruby_verbose)) return; }
va_start(args, fmt);
mesg = warning_string(0, fmt, args);
va_end(args);
rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
rb_str_catf(mesg, ": %s\n", strerror(errno_save));
rb_write_warning_str(mesg);
errno = errno_save;
} }
void void
rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...) rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
{ {
VALUE mesg; if (RTEST(ruby_verbose)) {
va_list args; int errno_save = errno;
int errno_save; with_warning_string(mesg, enc, fmt) {
syserr_warning(mesg, errno_save);
errno_save = errno; }
errno = errno_save;
if (!RTEST(ruby_verbose)) return; }
va_start(args, fmt);
mesg = warning_string(enc, fmt, args);
va_end(args);
rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
rb_str_catf(mesg, ": %s\n", strerror(errno_save));
rb_write_warning_str(mesg);
errno = errno_save;
} }
void void