From owner-svn-src-user@FreeBSD.ORG  Fri Jul 11 12:51:07 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A9F29102;
 Fri, 11 Jul 2014 12:51:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 977912594;
 Fri, 11 Jul 2014 12:51:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BCp7o8058947;
 Fri, 11 Jul 2014 12:51:07 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BCp7dn058946;
 Fri, 11 Jul 2014 12:51:07 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201407111251.s6BCp7dn058946@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Fri, 11 Jul 2014 12:51:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r268528 -
 user/jceel/soc2014_evdev/contrib/python-evdev/evdev
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jul 2014 12:51:07 -0000

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)) {