Clean up the detection of XI2

[xorg-xinput] / src / buttonmap.c

diff --git a/src/buttonmap.c b/src/buttonmap.c
index 0f17fdc10e6e8f99867d597f1533f34adef44ac4..21669e394209fcc80bb15eb159be5c01e44e1b78 100644 (file)
--- a/src/buttonmap.c
+++ b/src/buttonmap.c
@@ -1,19 +1,19 @@
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>
- *                                                                            
+ *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that
  * copyright  notice   and   this  permission   notice  appear  in  supporting
- * documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+ * documentation, and that   the  name of  the authors  not  be  used  in
  * advertising or publicity pertaining to distribution of the software without
- * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * specific,  written      prior  permission.     The authors  make  no
  * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.                   
- *                                                                            
- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
- * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+ * EVENT  SHALL THE AUTHORS  BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
  * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
@@ -40,17 +40,17 @@ set_button_map(Display      *display,
        fprintf(stderr, "usage: xinput %s %s\n", name, desc);
        return EXIT_FAILURE;
     }
-    
+
     info = find_device_info(display, argv[0], True);
-    
+
     if (!info) {
        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
-    }    
-    
+    }
+
     ip = (XAnyClassPtr) info->inputclassinfo;
     nbuttons = 0;
-           
+
     /* try to find the number of buttons */
     for(i=0; i<info->num_classes; i++) {
        if (ip->class == ButtonClass) {
@@ -63,19 +63,19 @@ set_button_map(Display      *display,
        fprintf(stderr, "device has no buttons\n");
        return EXIT_FAILURE;
     }
-           
+
     device = XOpenDevice(display, info->id);
     if (device) {
        int             idx;
        unsigned char   *map;
        int             min;
-               
+
        map = (unsigned char *) malloc(sizeof(unsigned char) * nbuttons);
-               
+
        XGetDeviceButtonMapping(display, device, map, nbuttons);
-               
+
        min = (argc > nbuttons + 1) ? nbuttons + 1 : argc;
-               
+
        for(idx=1; idx < min; idx++) {
            map[idx - 1] = atoi(argv[idx]);
        }