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

Cleanups - fix warnings

Browse Source
This commit is contained in:
twinaphex 2018-05-07 15:05:59 +02:00
parent 3753ff15fd
commit 3c73183a04
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libretro-common/formats/json/jsonsax_full.c
View File

@ -1217,7 +1217,7 @@ static void JSON_Parser_NullTerminateToken(JSON_Parser parser)
can write the null terminator to the buffer with impunity. */ can write the null terminator to the buffer with impunity. */
static const byte nullTerminatorBytes[LONGEST_ENCODING_SEQUENCE] = { 0 }; static const byte nullTerminatorBytes[LONGEST_ENCODING_SEQUENCE] = { 0 };
Encoding encoding = (Encoding)((parser->token == T_NUMBER) ? parser->numberEncoding : parser->stringEncoding); Encoding encoding = (Encoding)((parser->token == T_NUMBER) ? parser->numberEncoding : parser->stringEncoding);
memcpy(parser->pTokenBytes + parser->tokenBytesUsed, nullTerminatorBytes, SHORTEST_ENCODING_SEQUENCE(encoding)); memcpy(parser->pTokenBytes + parser->tokenBytesUsed, nullTerminatorBytes, (size_t)SHORTEST_ENCODING_SEQUENCE(encoding));
} }
static JSON_Status JSON_Parser_FlushParser(JSON_Parser parser) static JSON_Status JSON_Parser_FlushParser(JSON_Parser parser)
@ -1514,10 +1514,10 @@ static JSON_Status JSON_Parser_HandleInvalidNumber(JSON_Parser parser,
"1.2e-!" => "1.2" "1.2e-!" => "1.2"
*/ */
parser->codepointLocationByte -= (size_t)codepointsSinceValidNumber parser->codepointLocationByte -= (size_t)codepointsSinceValidNumber
* SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding); * (size_t)SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding);
parser->codepointLocationColumn -= (size_t)codepointsSinceValidNumber; parser->codepointLocationColumn -= (size_t)codepointsSinceValidNumber;
parser->tokenBytesUsed -= (size_t)codepointsSinceValidNumber parser->tokenBytesUsed -= (size_t)codepointsSinceValidNumber
* SHORTEST_ENCODING_SEQUENCE(parser->numberEncoding); * (size_t)SHORTEST_ENCODING_SEQUENCE(parser->numberEncoding);
return JSON_Parser_ProcessToken(parser); /* always fails */ return JSON_Parser_ProcessToken(parser); /* always fails */
} }
/* Allow JSON_Parser_FlushLexer() to fail. */ /* Allow JSON_Parser_FlushLexer() to fail. */
@ -3232,7 +3232,7 @@ static JSON_Status JSON_Writer_OutputString(JSON_Writer writer, const byte* pByt
static const byte* const quoteEncodings[5] = { quoteUTF + 3, quoteUTF + 3, quoteUTF + 2, quoteUTF + 3, quoteUTF }; static const byte* const quoteEncodings[5] = { quoteUTF + 3, quoteUTF + 3, quoteUTF + 2, quoteUTF + 3, quoteUTF };
const byte* pQuoteEncoded = quoteEncodings[writer->outputEncoding - 1]; const byte* pQuoteEncoded = quoteEncodings[writer->outputEncoding - 1];
size_t minSequenceLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding); size_t minSequenceLength = (size_t)SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
DecoderData decoderData; DecoderData decoderData;
WriteBufferData bufferData; WriteBufferData bufferData;
size_t i = 0; size_t i = 0;
@ -3510,7 +3510,7 @@ static JSON_Status JSON_Writer_OutputSpaces(JSON_Writer writer, size_t numberOfS
static const byte spacesUTF32[SPACES_PER_CHUNK * 4 + 3] = { 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0 }; static const byte spacesUTF32[SPACES_PER_CHUNK * 4 + 3] = { 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0 };
static const byte* const spacesEncodings[5] = { spacesUTF8, spacesUTF16 + 1, spacesUTF16, spacesUTF32 + 3, spacesUTF32 }; static const byte* const spacesEncodings[5] = { spacesUTF8, spacesUTF16 + 1, spacesUTF16, spacesUTF32 + 3, spacesUTF32 };
size_t encodedLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding); size_t encodedLength = (size_t)SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
const byte* encoded = spacesEncodings[writer->outputEncoding - 1]; const byte* encoded = spacesEncodings[writer->outputEncoding - 1];
while (numberOfSpaces > SPACES_PER_CHUNK) while (numberOfSpaces > SPACES_PER_CHUNK)
{ {
@ -3529,7 +3529,7 @@ static JSON_Status JSON_Writer_WriteSimpleToken(JSON_Writer writer, Symbol token
JSON_Status status = JSON_Failure; JSON_Status status = JSON_Failure;
if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None) if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
{ {
size_t encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding); size_t encodedLength = length * (size_t)SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API); SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
if (JSON_Writer_ProcessToken(writer, token) && if (JSON_Writer_ProcessToken(writer, token) &&
JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength)) JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
@ -3870,11 +3870,9 @@ JSON_Status JSON_CALL JSON_Writer_WriteNewLine(JSON_Writer writer)
encodings = lfEncodings; encodings = lfEncodings;
length = 1; length = 1;
} }
encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding); encodedLength = length * (size_t)SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
if (JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength)) if (JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
{
status = JSON_Success; status = JSON_Success;
}
SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API); SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
} }
return status; return status;

4
libretro-db/rmsgpack.c
View File

@ -599,7 +599,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_BIN8: case _MPF_BIN8:
case _MPF_BIN16: case _MPF_BIN16:
case _MPF_BIN32: case _MPF_BIN32:
if ((rv = read_buff(fd, 1<<(type - _MPF_BIN8), if ((rv = read_buff(fd, (size_t)(1 << (type - _MPF_BIN8)),
&buff, &tmp_len)) < 0) &buff, &tmp_len)) < 0)
return rv; return rv;
@ -633,7 +633,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_STR8: case _MPF_STR8:
case _MPF_STR16: case _MPF_STR16:
case _MPF_STR32: case _MPF_STR32:
if ((rv = read_buff(fd, 1<<(type - _MPF_STR8), &buff, &tmp_len)) < 0) if ((rv = read_buff(fd, (size_t)(1 << (type - _MPF_STR8)), &buff, &tmp_len)) < 0)
return rv; return rv;
if (callbacks->read_string) if (callbacks->read_string)

3
menu/menu_displaylist.c
View File

@ -4482,8 +4482,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
break; break;
case DISPLAYLIST_HISTORY: case DISPLAYLIST_HISTORY:
{ {
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
if (settings->bools.history_list_enable) if (settings->bools.history_list_enable)
menu_displaylist_parse_playlist_generic( menu_displaylist_parse_playlist_generic(
menu, info, menu, info,