ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(task_powerstate.c) Fix 'local variable state hides a global variable 

with the same name'
This commit is contained in:
twinaphex 2019-07-14 13:11:11 +02:00
parent 8ef251acbf
commit 31f142ef9c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasks/task_powerstate.c
View File

@ -16,12 +16,14 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "../../frontend/frontend_driver.h"
#include "tasks_internal.h"
#include <queues/task_queue.h> #include <queues/task_queue.h>
static int power_percent = 0; #include "../../frontend/frontend_driver.h"
static enum frontend_powerstate state = FRONTEND_POWERSTATE_NONE; #include "tasks_internal.h"
static int powerstate_percent = 0;
static enum frontend_powerstate powerstate_status = FRONTEND_POWERSTATE_NONE;
typedef struct powerstate powerstate_t; typedef struct powerstate powerstate_t;
@ -34,9 +36,9 @@ struct powerstate
enum frontend_powerstate get_last_powerstate(int *percent) enum frontend_powerstate get_last_powerstate(int *percent)
{ {
if (percent) if (percent)
*percent = power_percent; *percent = powerstate_percent;
return state; return powerstate_status;
} }
static void task_powerstate_cb(retro_task_t *task, static void task_powerstate_cb(retro_task_t *task,
@ -45,8 +47,8 @@ static void task_powerstate_cb(retro_task_t *task,
{ {
powerstate_t *powerstate = (powerstate_t*)task_data; powerstate_t *powerstate = (powerstate_t*)task_data;
power_percent = powerstate->percent; powerstate_percent = powerstate->percent;
state = powerstate->state; powerstate_status = powerstate->state;
free(powerstate); free(powerstate);
} }
@ -58,8 +60,9 @@ static void task_powerstate_handler(retro_task_t *task)
if (frontend && frontend->get_powerstate) if (frontend && frontend->get_powerstate)
{ {
int seconds = 0; int seconds = 0;
powerstate->state = frontend->get_powerstate(&seconds, &powerstate->percent); powerstate->state = frontend->get_powerstate(
&seconds, &powerstate->percent);
} }
task_set_data(task, powerstate); task_set_data(task, powerstate);