summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/ancdata.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7343398ed0..14cf2e237d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 6 07:08:45 2015 Eric Wong <e@80x24.org>
+
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): drop redundant assignment
+
Sat Jun 6 01:00:06 2015 Naohisa Goto <ngotogenome@gmail.com>
* ext/socket/ancdata.c (bsock_sendmsg_internal): all arguments are
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 756cf7ed64..6e59694723 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1268,10 +1268,6 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
mh.msg_control = RSTRING_PTR(controls_str);
mh.msg_controllen = RSTRING_SOCKLEN(controls_str);
}
- else {
- mh.msg_control = NULL;
- mh.msg_controllen = 0;
- }
#endif
rb_io_check_closed(fptr);