py/stream: Simplify arg extraction logic for stream_ioctl.

dpgeorge · dpgeorge · commit 657aef66ff3c · 2016-04-10T12:37:59.000+01:00
Saves 16 bytes of code.

Also, use mp_obj_get_int_truncated to allow integers as big as a machine
word to be passed as the value.
diff --git a/py/stream.c b/py/stream.c
@@ -416,11 +416,10 @@ STATIC mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     uintptr_t val = 0;
     if (n_args > 2) {
-        if (MP_OBJ_IS_INT(args[2])) {
-            val = mp_obj_get_int(args[2]);
-        } else {
-            mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+        if (mp_get_buffer(args[2], &bufinfo, MP_BUFFER_WRITE)) {
             val = (uintptr_t)bufinfo.buf;
+        } else {
+            val = mp_obj_get_int_truncated(args[2]);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -416,11 +416,10 @@ STATIC mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {`
`416`	`416`	`mp_buffer_info_t bufinfo;`
`417`	`417`	`uintptr_t val = 0;`
`418`	`418`	`if (n_args > 2) {`
`419`		`- if (MP_OBJ_IS_INT(args[2])) {`
`420`		`- val = mp_obj_get_int(args[2]);`
`421`		`- } else {`
`422`		`- mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);`
	`419`	`+ if (mp_get_buffer(args[2], &bufinfo, MP_BUFFER_WRITE)) {`
`423`	`420`	`val = (uintptr_t)bufinfo.buf;`
	`421`	`+ } else {`
	`422`	`+ val = mp_obj_get_int_truncated(args[2]);`
`424`	`423`	`}`
`425`	`424`	`}`
`426`	`425`