svn commit: r268528 - user/jceel/soc2014_evdev/contrib/python-evdev/evdev

Jakub Wojciech Klama jceel at FreeBSD.org
Fri Jul 11 12:51:07 UTC 2014


Author: jceel
Date: Fri Jul 11 12:51:07 2014
New Revision: 268528
URL: http://svnweb.freebsd.org/changeset/base/268528

Log:
  Fix ioctl() requested buffer size - it should be specified in bytes,
  not bits.

Modified:
  user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c

Modified: user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c	Fri Jul 11 07:31:55 2014	(r268527)
+++ user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c	Fri Jul 11 12:51:07 2014	(r268528)
@@ -164,7 +164,7 @@ ioctl_capabilities(PyObject *self, PyObj
 
     memset(&ev_bits, 0, sizeof(ev_bits));
 
-    if (ioctl(_fd, EVIOCGBIT(0, EV_MAX), ev_bits) < 0)
+    if (ioctl(_fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) < 0)
         goto on_err;
 
     // Build a dictionary of the device's capabilities
@@ -175,7 +175,7 @@ ioctl_capabilities(PyObject *self, PyObj
             eventcodes = PyList_New(0);
 
             memset(&code_bits, 0, sizeof(code_bits));
-            ioctl(_fd, EVIOCGBIT(ev_type, KEY_MAX), code_bits);
+            ioctl(_fd, EVIOCGBIT(ev_type, sizeof(code_bits)), code_bits);
 
             for (ev_code = 0; ev_code < KEY_MAX; ev_code++) {
                 if (test_bit(code_bits, ev_code)) {


More information about the svn-src-user mailing list