CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-06 10:27:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove snprintf_p for now

Browse Source
This commit is contained in:
twinaphex 2018-01-23 06:10:21 +01:00
parent 3d5bb2af17
commit 54726aa668
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
network/netplay/netplay_io.c
View File

@ -553,15 +553,11 @@ static void announce_play_spectate(netplay_t *netplay,
{
case NETPLAY_CONNECTION_SPECTATING:
if (nick)
{
snprintf_p(msg, sizeof(msg) - 1,
snprintf(msg, sizeof(msg) - 1,
msg_hash_to_str(MSG_NETPLAY_PLAYER_S_LEFT), NETPLAY_NICK_LEN,
nick);
}
else
{
strlcpy(msg, msg_hash_to_str(MSG_NETPLAY_YOU_HAVE_LEFT_THE_GAME), sizeof(msg));
}
break;
case NETPLAY_CONNECTION_PLAYING:
@ -590,18 +586,13 @@ static void announce_play_spectate(netplay_t *netplay,
{
/* Only have one device, simpler message */
if (nick)
{
snprintf_p(msg, sizeof(msg) - 1,
snprintf(msg, sizeof(msg) - 1,
msg_hash_to_str(MSG_NETPLAY_S_HAS_JOINED_AS_PLAYER_N),
NETPLAY_NICK_LEN, nick, one_device + 1);
}
else
{
snprintf(msg, sizeof(msg) - 1,
msg_hash_to_str(MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N),
one_device + 1);
}
}
else
{
@ -621,20 +612,16 @@ static void announce_play_spectate(netplay_t *netplay,
/* Then we make the final string */
if (nick)
{
snprintf_p(msg, sizeof(msg) - 1,
snprintf(msg, sizeof(msg) - 1,
msg_hash_to_str(
MSG_NETPLAY_S_HAS_JOINED_WITH_INPUT_DEVICES_S),
NETPLAY_NICK_LEN, nick, sizeof(device_str),
device_str);
}
else
{
snprintf(msg, sizeof(msg) - 1,
msg_hash_to_str(
MSG_NETPLAY_YOU_HAVE_JOINED_WITH_INPUT_DEVICES_S),
sizeof(device_str), device_str);
}
}
break;

7
network/netplay/netplay_private.h
View File

@ -95,13 +95,6 @@ typedef uint32_t client_bitmap_t;
#define NETPLAY_COMPRESSION_SUPPORTED 0
#endif
/* Positional snprintf */
#ifdef _MSC_VER
#define snprintf_p _snprintf_p
#else /* sensible systems */
#define snprintf_p snprintf
#endif
enum netplay_cmd
{
/* Basic commands */