diff options
Diffstat (limited to 'hw/dmx/input')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 6 | ||||
| -rw-r--r-- | hw/dmx/input/lnx-keyboard.c | 6 | ||||
| -rw-r--r-- | hw/dmx/input/usb-common.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 1b067c725..16ecae38d 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -671,9 +671,9 @@ static char *dmxMakeUniqueDeviceName(DMXLocalInputInfoPtr dmxLocal) } switch (dmxLocal->type) { - case DMX_LOCAL_KEYBOARD: XmuSnprintf(buf, LEN, "Keyboard%d", k++); break; - case DMX_LOCAL_MOUSE: XmuSnprintf(buf, LEN, "Mouse%d", m++); break; - default: XmuSnprintf(buf, LEN, "Other%d", o++); break; + case DMX_LOCAL_KEYBOARD: snprintf(buf, LEN, "Keyboard%d", k++); break; + case DMX_LOCAL_MOUSE: snprintf(buf, LEN, "Mouse%d", m++); break; + default: snprintf(buf, LEN, "Other%d", o++); break; } return buf; diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index 5bfb8813c..06e9ec722 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -429,11 +429,11 @@ static int kbdLinuxOpenVT(int vtno) { int fd = -1; int i; - const char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; - char name[64]; /* RATS: Only used in XmuSnprintf */ + const char *vcs[] = { "/dev/vc/", "/dev/tty", NULL }; + char name[64]; /* RATS: Only used in snprintf */ for (i = 0; vcs[i]; i++) { - XmuSnprintf(name, sizeof(name), vcs[i], vtno); + snprintf(name, sizeof(name), "%s%d", vcs[i], vtno); if ((fd = open(name, O_RDWR | O_NONBLOCK, 0)) >= 0) break; } if (fd < 0) diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c index 25479aea6..944033eba 100644 --- a/hw/dmx/input/usb-common.c +++ b/hw/dmx/input/usb-common.c @@ -272,7 +272,7 @@ device. */ void usbInit(DevicePtr pDev, usbType type) { GETPRIV; - char name[64]; /* RATS: Only used in XmuSnprintf */ + char name[64]; /* RATS: Only used in snprintf */ int i, j, k; char buf[256] = { 0, }; /* RATS: Use ok */ int version; @@ -284,7 +284,7 @@ void usbInit(DevicePtr pDev, usbType type) if (priv->fd >=0) return; for (i = 0; i < 32; i++) { - XmuSnprintf(name, sizeof(name), "/dev/input/event%d", i); + snprintf(name, sizeof(name), "/dev/input/event%d", i); if ((priv->fd = open(name, O_RDWR | O_NONBLOCK, 0)) >= 0) { ioctl(priv->fd, EVIOCGVERSION, &version); ioctl(priv->fd, EVIOCGNAME(sizeof(buf)), buf); |