Skip to content

Commit 79f0b05

Browse files
LibretroAdminLibretroAdmin
committed
rename result variables to ret
1 parent f41f467 commit 79f0b05

File tree

13 files changed

+95
-86
lines changed

13 files changed

+95
-86
lines changed

‎gfx/font_driver.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ static INLINE unsigned font_get_arabic_replacement(
582582
{ 0 }, { 0 }, { 0 }, { 0 },
583583
{ 0 }, { 0 }, { 0 }, { 0 },
584584
};
585-
unsigned result = 0;
585+
unsigned ret = 0;
586586
bool prev_connected = false;
587587
bool next_connected = false;
588588
unsigned char id = GET_ID_ARABIC(src);
@@ -654,10 +654,10 @@ static INLINE unsigned font_get_arabic_replacement(
654654
next_connected = !!arabic_shape_map[next_id][1];
655655
}
656656

657-
if ((result =
657+
if ((ret =
658658
arabic_shape_map[id][prev_connected | (next_connected <<
659659
1)]))
660-
return result;
660+
return ret;
661661
return arabic_shape_map[id][prev_connected];
662662
}
663663
/* clang-format on */

‎gfx/gfx_widgets.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ void gfx_widgets_iterate(
912912
dispgfx_widget_t *p_dispwidget = &dispwidget_st;
913913
/* c.f. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=323
914914
* On some platforms (e.g. 32-bit x86 without SSE),
915-
* gcc can produce inconsistent floating point results
915+
* GCC can produce inconsistent floating point results
916916
* depending upon optimisation level. This can break
917917
* floating point variable comparisons. A workaround is
918918
* to declare the affected variable as 'volatile', which

‎input/drivers/dinput.c‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,6 @@ static void dinput_poll(void *data)
406406
static bool dinput_mouse_button_pressed(
407407
struct dinput_input *di, unsigned port, unsigned key)
408408
{
409-
bool result = false;
410-
411409
switch (key)
412410
{
413411
case RETRO_DEVICE_ID_MOUSE_LEFT:
@@ -421,24 +419,36 @@ static bool dinput_mouse_button_pressed(
421419
case RETRO_DEVICE_ID_MOUSE_BUTTON_5:
422420
return (di->flags & DINP_FLAG_MOUSE_B5_BTN) ? true : false;
423421
case RETRO_DEVICE_ID_MOUSE_WHEELUP:
424-
result = (di->flags & DINP_FLAG_MOUSE_WU_BTN) ? true : false;
425-
di->flags &= ~DINP_FLAG_MOUSE_WU_BTN;
422+
if (di->flags & DINP_FLAG_MOUSE_WU_BTN)
423+
{
424+
di->flags &= ~DINP_FLAG_MOUSE_WU_BTN;
425+
return true;
426+
}
426427
break;
427428
case RETRO_DEVICE_ID_MOUSE_WHEELDOWN:
428-
result = (di->flags & DINP_FLAG_MOUSE_WD_BTN) ? true : false;
429-
di->flags &= ~DINP_FLAG_MOUSE_WD_BTN;
429+
if (di->flags & DINP_FLAG_MOUSE_WD_BTN)
430+
{
431+
di->flags &= ~DINP_FLAG_MOUSE_WD_BTN;
432+
return true;
433+
}
430434
break;
431435
case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP:
432-
result = (di->flags & DINP_FLAG_MOUSE_HWU_BTN) ? true : false;
433-
di->flags &= ~DINP_FLAG_MOUSE_HWU_BTN;
436+
if (di->flags & DINP_FLAG_MOUSE_HWU_BTN)
437+
{
438+
di->flags &= ~DINP_FLAG_MOUSE_HWU_BTN;
439+
return true;
440+
}
434441
break;
435442
case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN:
436-
result = (di->flags & DINP_FLAG_MOUSE_HWD_BTN) ? true : false;
437-
di->flags &= ~DINP_FLAG_MOUSE_HWD_BTN;
443+
if (di->flags & DINP_FLAG_MOUSE_HWD_BTN)
444+
{
445+
di->flags &= ~DINP_FLAG_MOUSE_HWD_BTN;
446+
return true;
447+
}
438448
break;
439449
}
440450

441-
return result;
451+
return false;
442452
}
443453

444454
static int16_t dinput_lightgun_aiming_state(

‎libretro-common/formats/bmp/rbmp.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,22 +231,22 @@ static int rbmp_bitcount(unsigned int a)
231231

232232
static int rbmp_shiftsigned(int v, int shift, int bits)
233233
{
234-
int result;
234+
int ret;
235235
int z = bits;
236236

237237
if (shift < 0)
238238
v <<= -shift;
239239
else
240240
v >>= shift;
241241

242-
result = v;
242+
ret = v;
243243

244244
while (z < 8)
245245
{
246-
result += v >> z;
247-
z += bits;
246+
ret += v >> z;
247+
z += bits;
248248
}
249-
return result;
249+
return ret;
250250
}
251251

252252
static unsigned char *rbmp_bmp_load(rbmp_context *s, unsigned *x, unsigned *y,

‎libretro-common/lists/string_list.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,19 @@ struct string_list *string_list_clone(const struct string_list *src)
329329

330330
for (i = 0; i < src->size; i++)
331331
{
332-
const char *_src = src->elems[i].data;
333-
size_t len = _src ? strlen(_src) : 0;
332+
const char *_src = src->elems[i].data;
333+
size_t len = _src ? strlen(_src) : 0;
334334

335-
dest->elems[i].data = NULL;
336-
dest->elems[i].attr = src->elems[i].attr;
335+
dest->elems[i].data = NULL;
336+
dest->elems[i].attr = src->elems[i].attr;
337337

338338
if (len != 0)
339339
{
340-
char *result = (char*)malloc(len + 1);
341-
if (result)
340+
char *ret = (char*)malloc(len + 1);
341+
if (ret)
342342
{
343-
strcpy(result, _src);
344-
dest->elems[i].data = result;
343+
strcpy(ret, _src);
344+
dest->elems[i].data = ret;
345345
}
346346
}
347347
}

‎libretro-common/net/net_ifinfo.c‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ bool net_ifinfo_new(net_ifinfo_t *list)
5151
#if defined(_WIN32) && !defined(_XBOX)
5252
/* Microsoft docs recommend doing it this way. */
5353
char buf[512];
54-
ULONG result;
54+
ULONG ret;
5555
PIP_ADAPTER_ADDRESSES addr;
5656
struct net_ifinfo_entry *entry;
5757
size_t interfaces = 0;
5858
ULONG flags = GAA_FLAG_SKIP_ANYCAST
59-
| GAA_FLAG_SKIP_MULTICAST
59+
| GAA_FLAG_SKIP_MULTICAST
6060
| GAA_FLAG_SKIP_DNS_SERVER;
6161
ULONG len = 15 * 1024;
6262
PIP_ADAPTER_ADDRESSES addresses = (PIP_ADAPTER_ADDRESSES)calloc(1, len);
@@ -66,8 +66,8 @@ bool net_ifinfo_new(net_ifinfo_t *list)
6666
if (!addresses)
6767
goto failure;
6868

69-
result = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, addresses, &len);
70-
if (result == ERROR_BUFFER_OVERFLOW)
69+
ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, addresses, &len);
70+
if (ret == ERROR_BUFFER_OVERFLOW)
7171
{
7272
PIP_ADAPTER_ADDRESSES new_addresses =
7373
(PIP_ADAPTER_ADDRESSES)realloc(addresses, len);
@@ -77,11 +77,11 @@ bool net_ifinfo_new(net_ifinfo_t *list)
7777
memset(new_addresses, 0, len);
7878

7979
addresses = new_addresses;
80-
result = GetAdaptersAddresses(AF_UNSPEC, flags, NULL,
80+
ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL,
8181
addresses, &len);
8282
}
8383
}
84-
if (result != ERROR_SUCCESS)
84+
if (ret != ERROR_SUCCESS)
8585
goto failure;
8686

8787
/* Count the number of valid interfaces first. */
@@ -332,8 +332,6 @@ void net_ifinfo_free(net_ifinfo_t *list)
332332

333333
bool net_ifinfo_best(const char *dst, void *src, bool ipv6)
334334
{
335-
bool ret = false;
336-
337335
/* TODO/FIXME: Implement for other platforms, if necessary. */
338336
#if defined(_WIN32) && !defined(_XBOX)
339337
if (!ipv6)
@@ -365,12 +363,12 @@ bool net_ifinfo_best(const char *dst, void *src, bool ipv6)
365363

366364
if (addresses)
367365
{
368-
ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
369-
GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
370-
ULONG result = GetAdaptersAddresses(AF_INET, flags, NULL,
366+
ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST
367+
| GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
368+
ULONG ret = GetAdaptersAddresses(AF_INET, flags, NULL,
371369
addresses, &len);
372370

373-
if (result == ERROR_BUFFER_OVERFLOW)
371+
if (ret == ERROR_BUFFER_OVERFLOW)
374372
{
375373
PIP_ADAPTER_ADDRESSES new_addresses =
376374
(PIP_ADAPTER_ADDRESSES)realloc(addresses, len);
@@ -380,13 +378,14 @@ bool net_ifinfo_best(const char *dst, void *src, bool ipv6)
380378
memset(new_addresses, 0, len);
381379

382380
addresses = new_addresses;
383-
result = GetAdaptersAddresses(AF_INET, flags, NULL,
381+
ret = GetAdaptersAddresses(AF_INET, flags, NULL,
384382
addresses, &len);
385383
}
386384
}
387385

388-
if (result == NO_ERROR)
386+
if (ret == NO_ERROR)
389387
{
388+
bool found = false;
390389
PIP_ADAPTER_ADDRESSES addr = addresses;
391390

392391
do
@@ -402,19 +401,19 @@ bool net_ifinfo_best(const char *dst, void *src, bool ipv6)
402401
memcpy(src, &addr_unicast->sin_addr,
403402
sizeof(addr_unicast->sin_addr));
404403

405-
ret = true;
404+
found = true;
406405
}
407406

408407
break;
409408
}
410409
} while ((addr = addr->Next));
410+
return found;
411411
}
412412

413413
free(addresses);
414414
}
415415
}
416416
}
417417
#endif
418-
419-
return ret;
418+
return false;
420419
}

‎libretro-common/queues/task_queue.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,20 +462,20 @@ static bool retro_task_threaded_find(
462462
retro_task_finder_t func, void *user_data)
463463
{
464464
retro_task_t *task = NULL;
465-
bool result = false;
465+
bool ret = false;
466466

467467
slock_lock(running_lock);
468468
for (task = tasks_running.front; task; task = task->next)
469469
{
470470
if (func(task, user_data))
471471
{
472-
result = true;
472+
ret = true;
473473
break;
474474
}
475475
}
476476
slock_unlock(running_lock);
477477

478-
return result;
478+
return ret;
479479
}
480480

481481
static void retro_task_threaded_retrieve(task_retriever_data_t *data)

‎libretro-common/streams/file_stream.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,12 @@ int filestream_vscanf(RFILE *stream, const char* format, va_list *args)
336336

337337
int filestream_scanf(RFILE *stream, const char* format, ...)
338338
{
339-
int result;
339+
int ret;
340340
va_list vl;
341341
va_start(vl, format);
342-
result = filestream_vscanf(stream, format, &vl);
342+
ret = filestream_vscanf(stream, format, &vl);
343343
va_end(vl);
344-
return result;
344+
return ret;
345345
}
346346

347347
int64_t filestream_seek(RFILE *stream, int64_t offset, int seek_position)
@@ -559,11 +559,11 @@ int filestream_vprintf(RFILE *stream, const char* format, va_list args)
559559
int filestream_printf(RFILE *stream, const char* format, ...)
560560
{
561561
va_list vl;
562-
int result;
562+
int ret;
563563
va_start(vl, format);
564-
result = filestream_vprintf(stream, format, vl);
564+
ret = filestream_vprintf(stream, format, vl);
565565
va_end(vl);
566-
return result;
566+
return ret;
567567
}
568568

569569
int filestream_error(RFILE *stream)

‎libretro-common/streams/file_stream_transforms.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ int64_t rfflush(RFILE * stream)
157157

158158
int rfprintf(RFILE * stream, const char * format, ...)
159159
{
160-
int result;
160+
int ret;
161161
va_list vl;
162162

163163
if (!stream)
164164
return -1;
165165

166166
va_start(vl, format);
167-
result = filestream_vprintf(stream, format, vl);
167+
ret = filestream_vprintf(stream, format, vl);
168168
va_end(vl);
169-
return result;
169+
return ret;
170170
}
171171

172172
int rferror(RFILE* stream)
@@ -181,14 +181,14 @@ int rfeof(RFILE* stream)
181181

182182
int rfscanf(RFILE * stream, const char * format, ...)
183183
{
184-
int result;
184+
int ret;
185185
va_list vl;
186186

187187
if (!stream)
188188
return 0;
189189

190190
va_start(vl, format);
191-
result = filestream_vscanf(stream, format, &vl);
191+
ret = filestream_vscanf(stream, format, &vl);
192192
va_end(vl);
193-
return result;
193+
return ret;
194194
}

‎libretro-common/streams/interface_stream.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ int64_t intfstream_write(intfstream_internal_t *intf,
382382
int intfstream_printf(intfstream_internal_t *intf,
383383
const char* format, ...)
384384
{
385+
int ret;
385386
va_list vl;
386-
int result;
387387

388388
if (!intf)
389389
return 0;
@@ -392,19 +392,19 @@ int intfstream_printf(intfstream_internal_t *intf,
392392
{
393393
case INTFSTREAM_FILE:
394394
va_start(vl, format);
395-
result = filestream_vprintf(intf->file.fp, format, vl);
395+
ret = filestream_vprintf(intf->file.fp, format, vl);
396396
va_end(vl);
397-
return result;
397+
return ret;
398398
case INTFSTREAM_MEMORY:
399399
return -1;
400400
case INTFSTREAM_CHD:
401401
return -1;
402402
case INTFSTREAM_RZIP:
403403
#if defined(HAVE_ZLIB)
404404
va_start(vl, format);
405-
result = rzipstream_vprintf(intf->rzip.fp, format, vl);
405+
ret = rzipstream_vprintf(intf->rzip.fp, format, vl);
406406
va_end(vl);
407-
return result;
407+
return ret;
408408
#else
409409
return -1;
410410
#endif

0 commit comments

Comments
 (0)