From ee6494c14b706044b63e990d3e1faaa8d82c46e7 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 18 Feb 2020 14:34:23 +0300 Subject: [PATCH] Use strcpy_trync in cellAvConfExt.cpp (silence warnings) --- rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp index bc18670048..2ddb15d085 100644 --- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp @@ -64,7 +64,7 @@ avconf_manager::avconf_manager() devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; devices[curindex].deviceNumber = curindex; - strcpy(devices[curindex].name, mic_list[index].c_str()); + strcpy_trunc(devices[curindex].name, mic_list[index]); curindex++; } @@ -83,7 +83,7 @@ avconf_manager::avconf_manager() devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; devices[curindex].deviceNumber = curindex; - strcpy(devices[curindex].name, mic_list[0].c_str()); + strcpy_trunc(devices[curindex].name, mic_list[0]); curindex++; break; @@ -99,7 +99,7 @@ avconf_manager::avconf_manager() devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_1; devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; devices[curindex].deviceNumber = curindex; - strcpy(devices[curindex].name, mic_list[0].c_str()); + strcpy_trunc(devices[curindex].name, mic_list[0]); curindex++; break; @@ -120,7 +120,7 @@ avconf_manager::avconf_manager() devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_NONE; devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; devices[curindex].deviceNumber = curindex; - strcpy(devices[curindex].name, "USB Camera"); + strcpy_trunc(devices[curindex].name, "USB Camera"); curindex++; } @@ -139,7 +139,7 @@ void avconf_manager::copy_device_info(u32 num, vm::ptr in info->availableModes[0].channel = devices[num].availableModes[0].channel; info->availableModes[0].fs = devices[num].availableModes[0].fs; info->deviceNumber = devices[num].deviceNumber; - strcpy(info->name, devices[num].name); + strcpy_trunc(info->name, devices[num].name); } error_code cellAudioOutUnregisterDevice(u32 deviceNumber)