Skip to content

Commit a646194

Browse files
committed
Cleanups
1 parent 1ca8233 commit a646194

7 files changed

Lines changed: 31 additions & 39 deletions

File tree

gfx/common/dbus_common.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ void dbus_ensure_connection(void)
3030
{
3131
#ifdef HAVE_DBUS
3232
DBusError err;
33-
int ret;
3433

3534
dbus_error_init(&err);
3635

gfx/common/wayland_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ static shm_buffer_t *create_shm_buffer(gfx_ctx_wayland_data_t *wl, int width,
520520
int height,
521521
uint32_t format)
522522
{
523-
int fd, ofd;
523+
int fd;
524524
struct wl_shm_pool *pool = NULL;
525525
void *data = NULL;
526526
shm_buffer_t *buffer = NULL;

gfx/display_servers/dispserv_kms.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ static void *kms_display_server_get_resolution_list(
126126
bool curr_interlaced = false;
127127
bool curr_dblscan = false;
128128
float curr_refreshrate = 0;
129-
unsigned curr_orientation = 0;
130129
struct video_display_config *conf = NULL;
131130

132131

gfx/display_servers/dispserv_win32.c

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -302,40 +302,41 @@ static bool win32_display_server_set_window_opacity(
302302
static bool win32_display_server_set_window_progress(
303303
void *data, int progress, bool finished)
304304
{
305-
uint8_t win32_flags = 0;
306-
HWND hwnd = win32_get_window();
307305
dispserv_win32_t *serv = (dispserv_win32_t*)data;
308306

309307
if (!serv)
310308
return false;
311309

312310
#ifdef HAS_TASKBAR_EXT
313-
win32_flags = win32_get_flags();
314-
315-
if (!serv->taskbar_list || !(win32_flags & WIN32_CMN_FLAG_TASKBAR_CREATED))
316-
return false;
317-
318-
if (progress == -1)
319-
{
320-
if (ITaskbarList3_SetProgressState(
321-
serv->taskbar_list, hwnd, TBPF_INDETERMINATE) != S_OK)
322-
return false;
323-
}
324-
else if (finished)
325-
{
326-
if (ITaskbarList3_SetProgressState(
327-
serv->taskbar_list, hwnd, TBPF_NOPROGRESS) != S_OK)
328-
return false;
329-
}
330-
else if (progress >= 0)
331311
{
332-
if (ITaskbarList3_SetProgressState(
333-
serv->taskbar_list, hwnd, TBPF_NORMAL) != S_OK)
334-
return false;
312+
uint8_t win32_flags = win32_get_flags();
313+
HWND hwnd = win32_get_window();
335314

336-
if (ITaskbarList3_SetProgressValue(
337-
serv->taskbar_list, hwnd, progress, 100) != S_OK)
315+
if (!serv->taskbar_list || !(win32_flags & WIN32_CMN_FLAG_TASKBAR_CREATED))
338316
return false;
317+
318+
if (progress == -1)
319+
{
320+
if (ITaskbarList3_SetProgressState(
321+
serv->taskbar_list, hwnd, TBPF_INDETERMINATE) != S_OK)
322+
return false;
323+
}
324+
else if (finished)
325+
{
326+
if (ITaskbarList3_SetProgressState(
327+
serv->taskbar_list, hwnd, TBPF_NOPROGRESS) != S_OK)
328+
return false;
329+
}
330+
else if (progress >= 0)
331+
{
332+
if (ITaskbarList3_SetProgressState(
333+
serv->taskbar_list, hwnd, TBPF_NORMAL) != S_OK)
334+
return false;
335+
336+
if (ITaskbarList3_SetProgressValue(
337+
serv->taskbar_list, hwnd, progress, 100) != S_OK)
338+
return false;
339+
}
339340
}
340341
#endif
341342

gfx/drivers/d3d8.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,6 @@ static void d3d8_set_vertices(
409409
unsigned pass,
410410
unsigned vert_width, unsigned vert_height, uint64_t frame_count)
411411
{
412-
unsigned width = d3d->vp.full_width;
413-
unsigned height = d3d->vp.full_height;
414-
415412
if (chain->last_width != vert_width || chain->last_height != vert_height)
416413
{
417414
Vertex vert[4];
@@ -2239,9 +2236,7 @@ static void d3d8_set_viewport(void *data,
22392236
static bool d3d8_initialize(d3d8_video_t *d3d, const video_info_t *info)
22402237
{
22412238
struct LinkInfo link_info;
2242-
unsigned i = 0;
22432239
bool ret = true;
2244-
settings_t *settings = config_get_ptr();
22452240

22462241
if (!d3d)
22472242
return false;

gfx/drivers/fpga_gfx.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ static void *fpga_init(const video_info_t *video,
135135
{
136136
fpga_t *fpga = (fpga_t*)calloc(1, sizeof(*fpga));
137137

138+
if (!fpga)
139+
return NULL;
140+
138141
*input = NULL;
139142
*input_data = NULL;
140143

@@ -152,11 +155,6 @@ static void *fpga_init(const video_info_t *video,
152155
fpga_create(fpga);
153156

154157
return fpga;
155-
156-
error:
157-
if (fpga)
158-
free(fpga);
159-
return NULL;
160158
}
161159

162160
static bool fpga_frame(void *data, const void *frame,

gfx/drivers/oga_gfx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ typedef struct oga_video
103103

104104
static bool oga_create_display(oga_video_t* vid)
105105
{
106-
int i, ret;
106+
int i;
107107
drmModeConnector *connector;
108108
drmModeModeInfo *mode;
109109
drmModeEncoder *encoder;

0 commit comments

Comments
 (0)