[BACK]Return to joymng.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/joymng.c between versions 1.4 and 1.9

version 1.4, 2008/01/29 13:32:51 version 1.9, 2012/01/22 21:47:13
Line 1 Line 1
 /*      $Id$    */  
   
 /*-  /*-
  * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>,   * Copyright (C) 2004 NONAKA Kimihiro <nonakap@gmail.com>
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 13 Line 11
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE   * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)   * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT   * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SUCH DAMAGE.  
  */   */
   
 #include "compiler.h"  #include "compiler.h"
Line 200  joydrv_initialize(void) Line 197  joydrv_initialize(void)
         memset(devlist, 0, allocsize);          memset(devlist, 0, allocsize);
   
         for (n = 0, i = 0; i < ndrv; ++i) {          for (n = 0, i = 0; i < ndrv; ++i) {
                 sprintf(str, "%d", i);                  g_snprintf(str, sizeof(str), "%d", i);
                 devlist[n] = joydrv_open(str);                  devlist[n] = joydrv_open(str);
                 if (devlist[n] == NULL) {                  if (devlist[n] == NULL) {
                         continue;                          continue;
Line 236  joydrv_terminate(void) Line 233  joydrv_terminate(void)
 }  }
   
 void *  void *
 joydrv_open(const char *devname)  joydrv_open(const char *dvname)
 {  {
         joydrv_sdl_hdl_t *shdl = NULL;          joydrv_sdl_hdl_t *shdl = NULL;
         joymng_devinfo_t *dev;          joymng_devinfo_t *dev;
Line 250  joydrv_open(const char *devname) Line 247  joydrv_open(const char *devname)
         int nbutton;          int nbutton;
         int i;          int i;
   
         if (devname == NULL) {          if (dvname == NULL) {
                 goto sdl_err;                  goto sdl_err;
         }          }
   
         errno = 0;          errno = 0;
         lval = strtol(devname, &endptr, 10);          lval = strtol(dvname, &endptr, 10);
         if (devname[0] == '\0' || *endptr != '\0') {          if (dvname[0] == '\0' || *endptr != '\0') {
                 goto sdl_err;                  goto sdl_err;
         }          }
         if (errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) {          if (errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) {
Removed from v.1.4  
changed lines
  Added in v.1.9

RetroPC.NET-CVS <cvs@retropc.net>