From 87d44af2189ad2d2ba602808208eb43356c87fc2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 29 Sep 2015 18:08:33 +0200 Subject: [PATCH] Static code analysis cleanups --- audio/drivers/alsa_qsa.c | 11 ++++++----- file_ops.c | 6 +++--- gfx/d3d/d3d.cpp | 10 +++++----- gfx/d3d/render_chain_cg.cpp | 3 +-- gfx/d3d/render_chain_xdk.cpp | 6 +++--- gfx/drivers/ctr_gfx.c | 6 +++--- gfx/drivers/omap_gfx.c | 26 ++++++++++++-------------- gfx/drivers/psp1_gfx.c | 5 +++-- gfx/video_thread_wrapper.c | 2 ++ input/drivers/udev_input.c | 3 +++ input/drivers_hid/iohidmanager_hid.c | 15 ++++++++------- libretro-common/file/retro_dirent.c | 4 ++-- libretro-common/net/net_compat.c | 3 +-- libretro-common/utils/md5.c | 5 +++-- libretro-db/main.c | 12 +++++++----- libretro-db/testlib.c | 1 - menu/menu_cbs.c | 2 ++ netplay.c | 3 ++- 18 files changed, 66 insertions(+), 57 deletions(-) diff --git a/audio/drivers/alsa_qsa.c b/audio/drivers/alsa_qsa.c index 99f0aea855..5fde5e78c3 100644 --- a/audio/drivers/alsa_qsa.c +++ b/audio/drivers/alsa_qsa.c @@ -232,10 +232,11 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size) { memcpy(alsa->buffer[alsa->buffer_index] + alsa->buffer_ptr, buf, avail_write); - alsa->buffer_ptr += avail_write; - buf += avail_write; - size -= avail_write; - written += avail_write; + + alsa->buffer_ptr += avail_write; + buf = (void*)((uint8_t*)buf + avail_write); + size -= avail_write; + written += avail_write; } if (alsa->buffer_ptr >= alsa->buf_size) @@ -244,7 +245,7 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size) alsa->buffer[alsa->buffer_index], alsa->buf_size); alsa->buffer_index = (alsa->buffer_index + 1) % alsa->buf_count; - alsa->buffer_ptr = 0; + alsa->buffer_ptr = 0; if (frames <= 0) { diff --git a/file_ops.c b/file_ops.c index 1b427a8786..e254f03b43 100644 --- a/file_ops.c +++ b/file_ops.c @@ -204,7 +204,6 @@ static int read_7zip_file( uint8_t *output = 0; size_t output_size = 0; uint16_t *temp = NULL; - size_t temp_size = 0; long outsize = -1; bool file_found = false; @@ -237,7 +236,8 @@ static int read_7zip_file( if (res == SZ_OK) { uint32_t i; - uint32_t blockIndex = 0xFFFFFFFF; + size_t temp_size = 0; + uint32_t block_index = 0xFFFFFFFF; for (i = 0; i < db.db.NumFiles; i++) { @@ -275,7 +275,7 @@ static int read_7zip_file( * sourceforge.net/p/sevenzip/discussion/45798/thread/6fb59aaf/ * */ file_found = true; - res = SzArEx_Extract(&db, &lookStream.s, i,&blockIndex, + res = SzArEx_Extract(&db, &lookStream.s, i, &block_index, &output, &output_size, &offset, &outSizeProcessed, &allocImp, &allocTempImp); diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index faeb0825f8..8df3cd39a7 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -756,15 +756,15 @@ static const gfx_ctx_driver_t *d3d_get_context(void *data) { /* Default to Direct3D9 for now. TODO: GL core contexts through ANGLE? */ - enum gfx_ctx_api api = GFX_CTX_DIRECT3D9_API; - unsigned major = 9; unsigned minor = 0; driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); - #if defined(HAVE_D3D8) - api = GFX_CTX_DIRECT3D8_API; - major = 8; + unsigned major = 8; + enum gfx_ctx_api api = GFX_CTX_DIRECT3D8_API; +#else + unsigned major = 9; + enum gfx_ctx_api api = GFX_CTX_DIRECT3D9_API; #endif return gfx_ctx_init_first(driver->video_data, settings->video.context_driver, diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index 502f94a55e..2e1d7d4555 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -1333,8 +1333,7 @@ static void renderchain_blit_to_texture(void *data, { D3DLOCKED_RECT d3dlr; cg_renderchain_t *chain = (cg_renderchain_t*)data; - Pass *first = (Pass*)&chain->passes[0]; - driver_t *driver = driver_get_ptr(); + Pass *first = (Pass*)&chain->passes[0]; if (first->last_width != width || first->last_height != height) { diff --git a/gfx/d3d/render_chain_xdk.cpp b/gfx/d3d/render_chain_xdk.cpp index d1e046d861..91efc2ba49 100644 --- a/gfx/d3d/render_chain_xdk.cpp +++ b/gfx/d3d/render_chain_xdk.cpp @@ -289,9 +289,11 @@ void *xdk_renderchain_new(void) static bool xdk_renderchain_init_shader(void *data, void *renderchain_data) { - const char *shader_path = NULL; d3d_video_t *d3d = (d3d_video_t*)data; +#if defined(HAVE_HLSL) + const char *shader_path = NULL; settings_t *settings = config_get_ptr(); +#endif if (!d3d) return false; @@ -395,8 +397,6 @@ static bool xdk_renderchain_render(void *data, const void *frame, static bool xdk_renderchain_add_lut(void *data, const char *id, const char *path, bool smooth) { - xdk_renderchain_t *chain = (xdk_renderchain_t*)data; - (void)data; (void)id; (void)path; diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index b00f9c9f59..ea6cf1f8a8 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -150,9 +150,6 @@ static void ctr_update_viewport(ctr_video_t* ctr) } else if (ctr->keep_aspect) { - float delta; - float desired_aspect = video_driver_get_aspect_ratio(); - #if defined(HAVE_MENU) if (settings->video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) { @@ -169,6 +166,9 @@ static void ctr_update_viewport(ctr_video_t* ctr) else #endif { + float delta; + float desired_aspect = video_driver_get_aspect_ratio(); + if (fabsf(device_aspect - desired_aspect) < 0.0001f) { /* If the aspect ratios of screen and desired aspect diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c index 90ba72b7fd..e31bec2747 100644 --- a/gfx/drivers/omap_gfx.c +++ b/gfx/drivers/omap_gfx.c @@ -311,8 +311,8 @@ static int omapfb_setup_pages(omapfb_data_t *pdata) for (i = 0; i < pdata->num_pages; ++i) { pdata->pages[i].yoffset = i * pdata->current_state->si.yres; - pdata->pages[i].buf = pdata->fb_mem + (i * pdata->fb_framesize); - pdata->pages[i].used = false; + pdata->pages[i].buf = (void*)((uint8_t*)pdata->fb_mem + (i * pdata->fb_framesize)); + pdata->pages[i].used = false; } pdata->old_page = NULL; @@ -504,7 +504,7 @@ static float omapfb_scaling(omapfb_data_t *pdata, int width, int height) static int omapfb_setup_plane(omapfb_data_t *pdata, int width, int height) { - int x, y, w, h; + int x, y; struct omapfb_plane_info pi = {0}; float scale = omapfb_scaling(pdata, width, height); int w = (int)(scale * width); @@ -833,19 +833,17 @@ static void omap_init_font(omap_video_t *vid, const char *font_path, unsigned fo return; } - { - r = settings->video.msg_color_r * 255; - g = settings->video.msg_color_g * 255; - b = settings->video.msg_color_b * 255; + r = settings->video.msg_color_r * 255; + g = settings->video.msg_color_g * 255; + b = settings->video.msg_color_b * 255; - r = (r < 0) ? 0 : (r > 255 ? 255 : r); - g = (g < 0) ? 0 : (g > 255 ? 255 : g); - b = (b < 0) ? 0 : (b > 255 ? 255 : b); + r = (r < 0) ? 0 : (r > 255 ? 255 : r); + g = (g < 0) ? 0 : (g > 255 ? 255 : g); + b = (b < 0) ? 0 : (b > 255 ? 255 : b); - vid->font_rgb[0] = r; - vid->font_rgb[1] = g; - vid->font_rgb[2] = b; - } + vid->font_rgb[0] = r; + vid->font_rgb[1] = g; + vid->font_rgb[2] = b; } static void omap_render_msg(omap_video_t *vid, const char *msg) diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index a7dae8d31d..a53f413f7f 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -706,8 +706,6 @@ static void psp_update_viewport(psp1_video_t* psp) } else if (psp->keep_aspect) { - float delta; - float desired_aspect = video_driver_get_aspect_ratio(); #if defined(HAVE_MENU) if (settings->video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) @@ -725,6 +723,9 @@ static void psp_update_viewport(psp1_video_t* psp) else #endif { + float delta; + float desired_aspect = video_driver_get_aspect_ratio(); + if ((fabsf(device_aspect - desired_aspect) < 0.0001f) || (fabsf((16.0/9.0) - desired_aspect) < 0.02f)) { diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c index ac2f56d0cd..633d74915b 100644 --- a/gfx/video_thread_wrapper.c +++ b/gfx/video_thread_wrapper.c @@ -126,7 +126,9 @@ static void thread_update_driver_state(thread_video_t *thr) /* returns true when thread_loop should quit */ static bool thread_handle_packet(thread_video_t *thr, const thread_packet_t *incoming) { +#ifdef HAVE_OVERLAY unsigned i; +#endif thread_packet_t pkt = *incoming; bool ret = false; diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 22729eba11..211cd311d6 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -632,6 +632,9 @@ static bool open_devices(udev_input_t *udev, const char *type, device_handle_cb if (devnode) { int fd = open(devnode, O_RDONLY | O_NONBLOCK); + + (void)fd; + RARCH_LOG("[udev] Adding device %s as type %s.\n", devnode, type); if (!add_device(udev, devnode, cb)) RARCH_ERR("[udev] Failed to open device: %s (%s).\n", devnode, strerror(errno)); diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c index 3127f81706..131fd8b98c 100644 --- a/input/drivers_hid/iohidmanager_hid.c +++ b/input/drivers_hid/iohidmanager_hid.c @@ -170,7 +170,6 @@ static void iohidmanager_hid_device_input_callback(void *data, IOReturn result, driver_t *driver = driver_get_ptr(); cocoa_input_data_t *apple = (cocoa_input_data_t*)driver->input_data; #endif - struct iohidmanager_hid_adapter *adapter = (struct iohidmanager_hid_adapter*)data; IOHIDElementRef element = IOHIDValueGetElement(value); uint32_t type = IOHIDElementGetType(element); uint32_t page = IOHIDElementGetUsagePage(element); @@ -196,15 +195,19 @@ static void iohidmanager_hid_device_input_callback(void *data, IOReturn result, break; default: { - int i; static const uint32_t axis_use_ids[4] = { 48, 49, 50, 53 }; + int i; +#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) + struct iohidmanager_hid_adapter *adapter = + (struct iohidmanager_hid_adapter*)data; +#endif for (i = 0; i < 4; i ++) { - CFIndex min = IOHIDElementGetPhysicalMin(element); - CFIndex max = IOHIDElementGetPhysicalMax(element) - min; - CFIndex state = IOHIDValueGetIntegerValue(value) - min; #if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) + CFIndex min = IOHIDElementGetPhysicalMin(element); + CFIndex state = IOHIDValueGetIntegerValue(value) - min; + CFIndex max = IOHIDElementGetPhysicalMax(element) - min; float val = (float)state / (float)max; #endif @@ -229,10 +232,8 @@ static void iohidmanager_hid_device_input_callback(void *data, IOReturn result, { #if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) CFIndex state = IOHIDValueGetIntegerValue(value); -#endif unsigned id = use - 1; -#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) if (state) BIT64_SET(apple->buttons[adapter->slot], id); else diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c index 456ebe5f9f..5087bb125a 100644 --- a/libretro-common/file/retro_dirent.c +++ b/libretro-common/file/retro_dirent.c @@ -78,14 +78,14 @@ struct RDIR struct RDIR *retro_opendir(const char *name) { +#if defined(_WIN32) char path_buf[1024]; +#endif struct RDIR *rdir = (struct RDIR*)calloc(1, sizeof(*rdir)); if (!rdir) return NULL; - (void)path_buf; - #if defined(_WIN32) snprintf(path_buf, sizeof(path_buf), "%s\\*", name); rdir->directory = FindFirstFile(path_buf, &rdir->entry); diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c index 8e55e03b63..6c99427ac8 100644 --- a/libretro-common/net/net_compat.c +++ b/libretro-common/net/net_compat.c @@ -188,13 +188,12 @@ int socket_select(int nfds, fd_set *readfs, fd_set *writefds, #if defined(__CELLOS_LV2__) return socketselect(nfds, readfs, writefds, errorfds, timeout); #elif defined(VITA) - int i = 0; SceNetEpollEvent ev = {0}; ev.events = PSP2_NET_EPOLLIN | PSP2_NET_EPOLLHUP; ev.data.fd = nfds; - if((i = sceNetEpollControl(rarch_epoll_fd, PSP2_NET_EPOLL_CTL_ADD, nfds, &ev))) + if((sceNetEpollControl(rarch_epoll_fd, PSP2_NET_EPOLL_CTL_ADD, nfds, &ev))) { int ret = sceNetEpollWait(rarch_epoll_fd, &ev, 1, 0); sceNetEpollControl(rarch_epoll_fd, PSP2_NET_EPOLL_CTL_DEL, nfds, NULL); diff --git a/libretro-common/utils/md5.c b/libretro-common/utils/md5.c index b592e27b21..7c1d925ac2 100644 --- a/libretro-common/utils/md5.c +++ b/libretro-common/utils/md5.c @@ -492,8 +492,6 @@ static void MDTestSuite(void) int main (int argc, char *argv[]) { - int i; - /* For each command line argument in turn: ** filename -- prints message digest and name of file ** -sstring -- prints message digest and contents of string @@ -504,6 +502,8 @@ int main (int argc, char *argv[]) if (argc == 1) MDFilter (); else + { + unsigned i; for (i = 1; i < argc; i++) if (argv[i][0] == '-' && argv[i][1] == 's') MDString (argv[i] + 2); @@ -512,6 +512,7 @@ int main (int argc, char *argv[]) else if (!strcmp (argv[i], "-x")) MDTestSuite (); else MDFile (argv[i]); + } return 0; } diff --git a/libretro-db/main.c b/libretro-db/main.c index f57ce5a860..7aec22fbd7 100644 --- a/libretro-db/main.c +++ b/libretro-db/main.c @@ -81,14 +81,14 @@ static unsigned char *dup_binary( const char* str, unsigned len ) static int provider( void* ctx, struct rmsgpack_dom_value* out ) { - unsigned i, hash; - pr_node_t** game_ptr = (pr_node_t**)ctx; - pr_node_t* game = *game_ptr; + unsigned i; + pr_node_t **game_ptr = (pr_node_t**)ctx; + pr_node_t *game = *game_ptr; - if ( game == NULL ) + if (!game) return 1; - *game_ptr = game->next; + *game_ptr = game->next; out->type = RDT_MAP; out->val.map.len = game->count; @@ -96,6 +96,8 @@ static int provider( void* ctx, struct rmsgpack_dom_value* out ) for ( i = 0; i < game->count; i++ ) { + unsigned hash; + out->val.map.items[ i ].key.type = RDT_STRING; out->val.map.items[ i ].key.val.string.len = game->pairs[ i ].key_len; out->val.map.items[ i ].key.val.string.buff = dup_string( game->pairs[ i ].key, game->pairs[ i ].key_len ); diff --git a/libretro-db/testlib.c b/libretro-db/testlib.c index 30592f3489..865576f598 100644 --- a/libretro-db/testlib.c +++ b/libretro-db/testlib.c @@ -85,7 +85,6 @@ static int value_provider(void *ctx, struct rmsgpack_dom_value *out) static int create_db(lua_State *L) { - int rv; RFILE *dst; const char *db_file = luaL_checkstring(L, -2); diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index 5a4948d050..17852b4918 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -157,4 +157,6 @@ void menu_cbs_init(void *data, menu_cbs_init_log(ret, "TITLE", label, elem0, elem1, type); ret = menu_driver_bind_init(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + + (void)ret; } diff --git a/netplay.c b/netplay.c index 2f1e7e5c79..24c2f87924 100644 --- a/netplay.c +++ b/netplay.c @@ -192,7 +192,6 @@ static bool send_chunk(netplay_t *netplay) **/ static bool get_self_input_state(netplay_t *netplay) { - unsigned i; uint32_t state = 0; struct delta_frame *ptr = &netplay->buffer[netplay->self_ptr]; driver_t *driver = driver_get_ptr(); @@ -200,6 +199,8 @@ static bool get_self_input_state(netplay_t *netplay) if (!driver->block_libretro_input && netplay->frame_count > 0) { + unsigned i; + /* First frame we always give zero input since relying on * input from first frame screws up when we use -F 0. */ retro_input_state_t cb = netplay->cbs.state_cb;