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

option.c: make error messages consistent

Browse Source 
* ext/socket/option.c (check_size): extract a macro to check
  binary data size, with a consistent message.
* ext/socket/option.c (sockopt_byte): fix error message,
  sizeof(int) differs from sizeof(unsigned char) in general.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-01-17 05:41:01 +00:00
parent 361d51a7ee
commit b25ad0daaa
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Jan 17 14:40:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/option.c (check_size): extract a macro to check
binary data size, with a consistent message.
* ext/socket/option.c (sockopt_byte): fix error message,
sizeof(int) differs from sizeof(unsigned char) in general.
Sat Jan 16 21:16:21 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jan 16 21:16:21 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (xstring): reset heredoc indent after dedenting, * parse.y (xstring): reset heredoc indent after dedenting,

23
ext/socket/option.c
View File

@ -27,6 +27,12 @@ VALUE rb_cSockOpt;
# define USE_INSPECT_BYTE 1 # define USE_INSPECT_BYTE 1
#endif #endif
#define check_size(len, size) \
((len) == (size) ? \
(void)0 : \
rb_raise(rb_eTypeError, "size differ. expected as "#size"=%d but %ld", \
(int)size, (long)(len)))
static VALUE static VALUE
sockopt_pack_byte(VALUE value) sockopt_pack_byte(VALUE value)
{ {
@ -211,12 +217,9 @@ sockopt_s_byte(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE v
static VALUE static VALUE
sockopt_byte(VALUE self) sockopt_byte(VALUE self)
{ {
unsigned char i;
VALUE data = sockopt_data(self); VALUE data = sockopt_data(self);
StringValue(data); StringValue(data);
if (RSTRING_LEN(data) != sizeof(i)) check_size(RSTRING_LEN(data), sizeof(char));
rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld",
(int)sizeof(i), (long)RSTRING_LEN(data));
return CHR2FIX(*RSTRING_PTR(data)); return CHR2FIX(*RSTRING_PTR(data));
} }
@ -257,9 +260,7 @@ sockopt_int(VALUE self)
int i; int i;
VALUE data = sockopt_data(self); VALUE data = sockopt_data(self);
StringValue(data); StringValue(data);
if (RSTRING_LEN(data) != sizeof(int)) check_size(RSTRING_LEN(data), sizeof(int));
rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld",
(int)sizeof(int), (long)RSTRING_LEN(data));
memcpy((char*)&i, RSTRING_PTR(data), sizeof(int)); memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
return INT2NUM(i); return INT2NUM(i);
} }
@ -303,9 +304,7 @@ sockopt_bool(VALUE self)
int i; int i;
VALUE data = sockopt_data(self); VALUE data = sockopt_data(self);
StringValue(data); StringValue(data);
if (RSTRING_LEN(data) != sizeof(int)) check_size(RSTRING_LEN(data), sizeof(int));
rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld",
(int)sizeof(int), (long)RSTRING_LEN(data));
memcpy((char*)&i, RSTRING_PTR(data), sizeof(int)); memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
return i == 0 ? Qfalse : Qtrue; return i == 0 ? Qfalse : Qtrue;
} }
@ -358,9 +357,7 @@ sockopt_linger(VALUE self)
if (level != SOL_SOCKET || optname != SO_LINGER) if (level != SOL_SOCKET || optname != SO_LINGER)
rb_raise(rb_eTypeError, "linger socket option expected"); rb_raise(rb_eTypeError, "linger socket option expected");
if (RSTRING_LEN(data) != sizeof(l)) check_size(RSTRING_LEN(data), sizeof(struct linger));
rb_raise(rb_eTypeError, "size differ. expected as sizeof(struct linger)=%d but %ld",
(int)sizeof(struct linger), (long)RSTRING_LEN(data));
memcpy((char*)&l, RSTRING_PTR(data), sizeof(struct linger)); memcpy((char*)&l, RSTRING_PTR(data), sizeof(struct linger));
switch (l.l_onoff) { switch (l.l_onoff) {
case 0: vonoff = Qfalse; break; case 0: vonoff = Qfalse; break;