Skip to content

Commit 2f2a8ea

Browse files
LibretroAdminLibretroAdmin
committed
Resync
1 parent 30df122 commit 2f2a8ea

7 files changed

Lines changed: 37 additions & 32 deletions

File tree

‎audio/dsp_filter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static bool create_filter_graph(retro_dsp_filter_t *dsp, float sample_rate)
112112

113113
snprintf(key, sizeof(key), "filter%u", i);
114114

115-
if (config_get_array(dsp->conf, key, name, sizeof(name)) == 0)
115+
if (!config_get_array(dsp->conf, key, name, sizeof(name)))
116116
return false;
117117

118118
dsp->instances[i].impl = find_implementation(dsp, name);

‎file/archive_file.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static int file_archive_get_file_list_cb(
5050
struct archive_extract_userdata *userdata)
5151
{
5252
union string_list_elem_attr attr;
53-
attr.i = 0;
53+
attr.i = RARCH_COMPRESSED_FILE_IN_ARCHIVE;
5454

5555
if (valid_exts)
5656
{
@@ -80,8 +80,6 @@ static int file_archive_get_file_list_cb(
8080
string_list_deinitialize(&ext_list);
8181
return -1;
8282
}
83-
84-
attr.i = RARCH_COMPRESSED_FILE_IN_ARCHIVE;
8583
}
8684

8785
string_list_deinitialize(&ext_list);

‎file/archive_file_7z.c‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static int64_t sevenzip_file_read(
205205

206206
for (i = 0; i < db.NumFiles; i++)
207207
{
208-
size_t len;
208+
size_t _len;
209209
char infile[PATH_MAX_LENGTH];
210210
size_t offset = 0;
211211
size_t outSizeProcessed = 0;
@@ -215,14 +215,14 @@ static int64_t sevenzip_file_read(
215215
if (SzArEx_IsDir(&db, i))
216216
continue;
217217

218-
len = SzArEx_GetFileNameUtf16(&db, i, NULL);
218+
_len = SzArEx_GetFileNameUtf16(&db, i, NULL);
219219

220-
if (len > temp_size)
220+
if (_len > temp_size)
221221
{
222222
if (temp)
223223
free(temp);
224-
temp_size = len;
225-
temp = (uint16_t *)malloc(temp_size * sizeof(temp[0]));
224+
temp_size = _len;
225+
temp = (uint16_t *)malloc(temp_size * sizeof(temp[0]));
226226

227227
if (temp == 0)
228228
{
@@ -414,7 +414,6 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
414414
static int sevenzip_parse_file_iterate_step_internal(
415415
struct sevenzip_context_t *sevenzip_context,
416416
char *s,
417-
size_t len,
418417
const uint8_t **cdata,
419418
unsigned *cmode,
420419
uint32_t *size,
@@ -425,7 +424,7 @@ static int sevenzip_parse_file_iterate_step_internal(
425424
{
426425
if (sevenzip_context->parse_index < sevenzip_context->db.NumFiles)
427426
{
428-
size_t len = SzArEx_GetFileNameUtf16(&sevenzip_context->db,
427+
size_t _len = SzArEx_GetFileNameUtf16(&sevenzip_context->db,
429428
sevenzip_context->parse_index, NULL);
430429
uint64_t compressed_size = 0;
431430

@@ -437,28 +436,33 @@ static int sevenzip_parse_file_iterate_step_internal(
437436
sevenzip_context->packIndex++;
438437
}
439438

440-
if ( (len < PATH_MAX_LENGTH)
439+
if ( (_len < PATH_MAX_LENGTH)
441440
&& !SzArEx_IsDir(&sevenzip_context->db, sevenzip_context->parse_index))
442441
{
442+
char infile[PATH_MAX_LENGTH];
443443
SRes res = SZ_ERROR_FAIL;
444-
uint16_t *temp = (uint16_t*)malloc(len * sizeof(uint16_t));
444+
uint16_t *temp = (uint16_t*)malloc(_len * sizeof(uint16_t));
445445

446446
if (!temp)
447447
return -1;
448448

449+
infile[0] = '\0';
450+
449451
SzArEx_GetFileNameUtf16(&sevenzip_context->db, sevenzip_context->parse_index,
450452
temp);
451453

452454
if (temp)
453455
{
454-
res = utf16_to_char_string(temp, s, len)
456+
res = utf16_to_char_string(temp, infile, sizeof(infile))
455457
? SZ_OK : SZ_ERROR_FAIL;
456458
free(temp);
457459
}
458460

459461
if (res != SZ_OK)
460462
return -1;
461463

464+
strlcpy(s, infile, PATH_MAX_LENGTH);
465+
462466
*cmode = 0; /* unused for 7zip */
463467
*checksum = sevenzip_context->db.CRCs.Vals[sevenzip_context->parse_index];
464468
*size = (uint32_t)SzArEx_GetFileSize(&sevenzip_context->db, sevenzip_context->parse_index);
@@ -492,7 +496,6 @@ static int sevenzip_parse_file_iterate_step(void *context,
492496

493497
ret = sevenzip_parse_file_iterate_step_internal(sevenzip_context,
494498
userdata->current_file_path,
495-
sizeof(userdata->current_file_path),
496499
&cdata, &cmode, &size, &csize,
497500
&checksum, &payload, userdata);
498501

‎file/config_file.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,26 +1167,29 @@ size_t config_get_config_path(config_file_t *conf, char *s, size_t len)
11671167
return 0;
11681168
}
11691169

1170-
size_t config_get_array(config_file_t *conf, const char *key,
1170+
bool config_get_array(config_file_t *conf, const char *key,
11711171
char *buf, size_t size)
11721172
{
11731173
const struct config_entry_list *entry = config_get_entry(conf, key);
11741174
if (entry)
11751175
return strlcpy(buf, entry->value, size) < size;
1176-
return 0;
1176+
return false;
11771177
}
11781178

1179-
size_t config_get_path(config_file_t *conf, const char *key,
1179+
bool config_get_path(config_file_t *conf, const char *key,
11801180
char *buf, size_t size)
11811181
{
11821182
#if defined(RARCH_CONSOLE) || !defined(RARCH_INTERNAL)
11831183
return config_get_array(conf, key, buf, size);
11841184
#else
11851185
const struct config_entry_list *entry = config_get_entry(conf, key);
11861186
if (entry)
1187-
return fill_pathname_expand_special(buf, entry->value, size);
1187+
{
1188+
fill_pathname_expand_special(buf, entry->value, size);
1189+
return true;
1190+
}
1191+
return false;
11881192
#endif
1189-
return 0;
11901193
}
11911194

11921195
/**

‎formats/json/rjson.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,15 @@ static INLINE bool _rjson_pushchar(rjson_t *json, _rjson_char_t c)
163163
static INLINE bool _rjson_pushchars(rjson_t *json,
164164
const unsigned char *from, const unsigned char *to)
165165
{
166-
size_t len = json->string_len, new_len = len + (to - from);
167166
unsigned char* string;
167+
size_t _len = json->string_len;
168+
size_t new_len = _len + (to - from);
168169
while (new_len >= json->string_cap)
169170
if (!_rjson_grow_string(json))
170171
return false;
171172
string = (unsigned char *)json->string;
172-
while (len != new_len)
173-
string[len++] = *(from++);
173+
while (_len != new_len)
174+
string[_len++] = *(from++);
174175
json->string_len = new_len;
175176
return true;
176177
}
@@ -1126,7 +1127,7 @@ enum rjson_type rjson_parse(rjson_t *json, void* context,
11261127
bool (*null_handler )(void *context))
11271128
{
11281129
bool in_object = false;
1129-
size_t len;
1130+
size_t _len;
11301131
const char* string;
11311132
if (!object_member_handler) object_member_handler = _rjson_nop_string;
11321133
if (!string_handler ) string_handler = _rjson_nop_string;
@@ -1142,16 +1143,16 @@ enum rjson_type rjson_parse(rjson_t *json, void* context,
11421143
switch (rjson_next(json))
11431144
{
11441145
case RJSON_STRING:
1145-
string = rjson_get_string(json, &len);
1146+
string = rjson_get_string(json, &_len);
11461147
if (_rJSON_LIKELY(
11471148
(in_object && (json->stack_top->count & 1) ?
11481149
object_member_handler : string_handler)
1149-
(context, string, len)))
1150+
(context, string, _len)))
11501151
continue;
11511152
return RJSON_STRING;
11521153
case RJSON_NUMBER:
1153-
string = rjson_get_string(json, &len);
1154-
if (_rJSON_LIKELY(number_handler(context, string, len)))
1154+
string = rjson_get_string(json, &_len);
1155+
if (_rJSON_LIKELY(number_handler(context, string, _len)))
11551156
continue;
11561157
return RJSON_NUMBER;
11571158
case RJSON_OBJECT:

‎include/file/config_file.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ bool config_get_char(config_file_t *conf, const char *entry, char *in);
263263
bool config_get_string(config_file_t *conf, const char *entry, char **in);
264264

265265
/* Extracts a string to a preallocated buffer. Avoid memory allocation. */
266-
size_t config_get_array(config_file_t *conf, const char *entry, char *s, size_t len);
266+
bool config_get_array(config_file_t *conf, const char *entry, char *s, size_t len);
267267

268268
/**
269269
* config_get_config_path:
@@ -278,7 +278,7 @@ size_t config_get_config_path(config_file_t *conf, char *s, size_t len);
278278

279279
/* Extracts a string to a preallocated buffer. Avoid memory allocation.
280280
* Recognized magic like ~/. Similar to config_get_array() otherwise. */
281-
size_t config_get_path(config_file_t *conf, const char *entry, char *s, size_t len);
281+
bool config_get_path(config_file_t *conf, const char *entry, char *s, size_t len);
282282

283283
/**
284284
* config_get_bool:

‎include/retro_timers.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <psp2/kernel/threadmgr.h>
4040
#elif defined(_3DS)
4141
#include <3ds.h>
42-
#elif defined(EMSCRIPTEN)
42+
#elif defined(EMSCRIPTEN_FIXME)
4343
#include <emscripten/emscripten.h>
4444
#else
4545
#include <time.h>
@@ -100,7 +100,7 @@ static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
100100
#define retro_sleep(msec) (usleep(1000 * (msec)))
101101
#elif defined(WIIU)
102102
#define retro_sleep(msec) (OSSleepTicks(ms_to_ticks((msec))))
103-
#elif defined(EMSCRIPTEN)
103+
#elif defined(EMSCRIPTEN_FIXME)
104104
#define retro_sleep(msec) (emscripten_sleep(msec))
105105
#else
106106
static INLINE void retro_sleep(unsigned msec)

0 commit comments

Comments
 (0)