Replace calls to asprintf with SDL_asprintf

This commit is contained in:
Cameron Cawley 2021-09-14 20:38:03 +01:00 committed by Sam Lantinga
parent 25a614bc3e
commit 08ae790497
2 changed files with 3 additions and 3 deletions

View file

@ -273,7 +273,7 @@ SDL_EVDEV_kbd_init(void)
* Ensures that the keystrokes do not leak through to the console. * Ensures that the keystrokes do not leak through to the console.
*/ */
ioctl(kbd->console_fd, CONS_RELKBD, 1ul); ioctl(kbd->console_fd, CONS_RELKBD, 1ul);
asprintf(&devicePath, "/dev/kbd%d", kbd->kbInfo->kb_index); SDL_asprintf(&devicePath, "/dev/kbd%d", kbd->kbInfo->kb_index);
kbd->keyboard_fd = open(devicePath, O_WRONLY | O_CLOEXEC); kbd->keyboard_fd = open(devicePath, O_WRONLY | O_CLOEXEC);
if (kbd->keyboard_fd == -1) if (kbd->keyboard_fd == -1)
{ {
@ -288,7 +288,7 @@ SDL_EVDEV_kbd_init(void)
if (!SDL_GetHintBoolean(SDL_HINT_NO_SIGNAL_HANDLERS, SDL_FALSE)) { if (!SDL_GetHintBoolean(SDL_HINT_NO_SIGNAL_HANDLERS, SDL_FALSE)) {
kbd_register_emerg_cleanup(kbd); kbd_register_emerg_cleanup(kbd);
} }
free(devicePath); SDL_free(devicePath);
} }
else kbd->keyboard_fd = kbd->console_fd; else kbd->keyboard_fd = kbd->console_fd;
} }

View file

@ -426,7 +426,7 @@ BSD_JoystickOpen(SDL_Joystick *joy, int device_index)
str[i] = UGETW(usd.usd_desc.bString[i]); str[i] = UGETW(usd.usd_desc.bString[i]);
} }
str[i] = '\0'; str[i] = '\0';
asprintf(&new_name, "%s @ %s", str, path); SDL_asprintf(&new_name, "%s @ %s", str, path);
if (new_name != NULL) { if (new_name != NULL) {
SDL_free(joydevnames[numjoysticks]); SDL_free(joydevnames[numjoysticks]);
joydevnames[numjoysticks] = new_name; joydevnames[numjoysticks] = new_name;