--- np2/x11/joymng.c	2007/01/23 15:48:20	1.3
+++ np2/x11/joymng.c	2011/12/17 19:55:48	1.8
@@ -1,7 +1,5 @@
-/*	$Id: joymng.c,v 1.3 2007/01/23 15:48:20 monaka Exp $	*/
-
 /*-
- * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>,
+ * Copyright (c) 2004 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -200,7 +198,7 @@ joydrv_initialize(void)
 	memset(devlist, 0, allocsize);
 
 	for (n = 0, i = 0; i < ndrv; ++i) {
-		sprintf(str, "%d", i);
+		g_snprintf(str, sizeof(str), "%d", i);
 		devlist[n] = joydrv_open(str);
 		if (devlist[n] == NULL) {
 			continue;
@@ -217,7 +215,7 @@ sdl_err:
 	if (devlist) {
 		for (i = 0; i < ndrv; ++i) {
 			if (devlist[i]) {
-				joydrv_sdl_close(devlist[i]);
+				joydrv_close(devlist[i]);
 			}
 		}
 		_MFREE(devlist);
@@ -236,7 +234,7 @@ joydrv_terminate(void)
 }
 
 void *
-joydrv_open(const char *devname)
+joydrv_open(const char *dvname)
 {
 	joydrv_sdl_hdl_t *shdl = NULL;
 	joymng_devinfo_t *dev;
@@ -250,13 +248,13 @@ joydrv_open(const char *devname)
 	int nbutton;
 	int i;
 
-	if (devname == NULL) {
+	if (dvname == NULL) {
 		goto sdl_err;
 	}
 
 	errno = 0;
-	lval = strtol(devname, &endptr, 10);
-	if (devname[0] == '\0' || *endptr != '\0') {
+	lval = strtol(dvname, &endptr, 10);
+	if (dvname[0] == '\0' || *endptr != '\0') {
 		goto sdl_err;
 	}
 	if (errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) {