From da13fb0f48acce70b137b28597079e40e4d569a7 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Thu, 25 Aug 2022 05:19:30 +0200 Subject: [PATCH] Don't include errno.h in files that don't justify its use --- file_path_special.c | 1 - frontend/drivers/platform_ctr.c | 1 - frontend/drivers/platform_switch.c | 1 - frontend/drivers/platform_win32.c | 1 - gfx/common/wayland_common.c | 9 +++--- gfx/drivers/drm_gfx.c | 36 ++++++++---------------- gfx/drivers_context/drm_ctx.c | 3 +- gfx/drivers_context/drm_go2_ctx.c | 1 - gfx/drivers_context/vc_egl_ctx.c | 1 - input/drivers/wayland_input.c | 1 - input/drivers_joypad/mfi_joypad.m | 1 - input/drivers_joypad/parport_joypad.c | 1 - input/drivers_joypad/udev_joypad.c | 1 - libretro-common/file/file_path.c | 1 - libretro-common/file/file_path_io.c | 1 - libretro-common/formats/image_transfer.c | 3 +- libretro-common/streams/file_stream.c | 1 - retroarch.c | 1 - runloop.c | 1 - tasks/task_bluetooth.c | 1 - tasks/task_content_disc.c | 1 - tasks/task_file_transfer.c | 1 - tasks/task_image.c | 1 - tasks/task_save.c | 1 - tasks/task_wifi.c | 1 - 25 files changed, 19 insertions(+), 53 deletions(-) diff --git a/file_path_special.c b/file_path_special.c index 4cd72daf8f..8bbeb9fd73 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index d24c5cd1b1..a82f42404a 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include <3ds.h> diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c index 19b610174a..ab82c9dcc6 100644 --- a/frontend/drivers/platform_switch.c +++ b/frontend/drivers/platform_switch.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index 7a39285428..9add158247 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -23,7 +23,6 @@ #include #if defined(_WIN32) && !defined(_XBOX) #include -#include #endif #include diff --git a/gfx/common/wayland_common.c b/gfx/common/wayland_common.c index 1a3a443b28..03cb91ba49 100644 --- a/gfx/common/wayland_common.c +++ b/gfx/common/wayland_common.c @@ -368,18 +368,17 @@ static shm_buffer_t *create_shm_buffer(gfx_ctx_wayland_data_t *wl, int width, if (size <= 0) return NULL; - fd = create_shm_file(size); - if (fd < 0) + if ((fd = create_shm_file(size)) < 0) { - RARCH_ERR("[Wayland] [SHM]: Creating a buffer file for %d B failed: %s\n", - size, strerror(errno)); + RARCH_ERR("[Wayland] [SHM]: Creating a buffer file for %d B failed\n", + size); return NULL; } data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (data == MAP_FAILED) { - RARCH_ERR("[Wayland] [SHM]: mmap failed: %s\n", strerror(errno)); + RARCH_ERR("[Wayland] [SHM]: mmap failed\n"); close(fd); return NULL; } diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index b0b380c698..d4349dfe7b 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -277,7 +276,6 @@ static void drm_page_flip(struct drm_surface *surface) /* We alredy have the id of the FB_ID property of * the plane on which we are going to do a pageflip: * we got it back in drm_plane_setup() */ - int ret; static drmModeAtomicReqPtr req = NULL; req = drmModeAtomicAlloc(); @@ -285,12 +283,10 @@ static void drm_page_flip(struct drm_surface *surface) /* We add the buffer to the plane properties we want to * set on an atomically, in a single step. * We pass the plane id, the property id and the new fb id. */ - ret = drmModeAtomicAddProperty(req, + if (drmModeAtomicAddProperty(req, drm.plane_id, drm.plane_fb_prop_id, - surface->pages[surface->flip_page].buf.fb_id); - - if (ret < 0) + surface->pages[surface->flip_page].buf.fb_id) < 0) { RARCH_ERR ("DRM: failed to add atomic property for pageflip\n"); } @@ -301,11 +297,9 @@ static void drm_page_flip(struct drm_surface *surface) * pageflip is complete. If you don't want -12 errors * (ENOMEM), namely "Cannot allocate memory", then * you must drain the event queue of that fd. */ - ret = drmModeAtomicCommit(drm.fd, req, 0, NULL); - - if (ret < 0) + if (drmModeAtomicCommit(drm.fd, req, 0, NULL) < 0) { - RARCH_ERR ("DRM: failed to commit for pageflip: %s\n", strerror(errno)); + RARCH_ERR ("DRM: failed to commit for pageflip\n"); } surface->flip_page = !(surface->flip_page); @@ -543,7 +537,7 @@ static void drm_plane_setup(struct drm_surface *surface) plane_flags, plane_x, plane_y, plane_w, plane_h, src_x<<16, src_y<<16, src_w<<16, src_h<<16)) { - RARCH_ERR("[DRM]: failed to enable plane: %s\n", strerror(errno)); + RARCH_ERR("[DRM]: failed to enable plane\n"); } RARCH_LOG("[DRM]: src_w %d, src_h %d, plane_w %d, plane_h %d\n", @@ -604,9 +598,8 @@ static int modeset_create_dumbfb(int fd, struct modeset_buf *buf, static bool init_drm(void) { - int ret; - drmModeConnector *connector; uint i; + drmModeConnector *connector; drm.fd = open("/dev/dri/card0", O_RDWR); @@ -619,18 +612,16 @@ static bool init_drm(void) /* Programmer!! Save your sanity!! * VERY important or we won't get all the available planes on drmGetPlaneResources()! * We also need to enable the ATOMIC cap to see the atomic properties in objects!! */ - ret = drmSetClientCap(drm.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); - if (ret) + if (drmSetClientCap(drm.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) RARCH_ERR ("DRM: can't set UNIVERSAL PLANES cap.\n"); else RARCH_LOG ("DRM: UNIVERSAL PLANES cap set\n"); - ret = drmSetClientCap(drm.fd, DRM_CLIENT_CAP_ATOMIC, 1); - if (ret) + if (drmSetClientCap(drm.fd, DRM_CLIENT_CAP_ATOMIC, 1)) { /*If this happens, check kernel support and kernel parameters * (add i915.nuclear_pageflip=y to the kernel boot line for example) */ - RARCH_ERR ("DRM: can't set ATOMIC caps: %s\n", strerror(errno)); + RARCH_ERR ("DRM: can't set ATOMIC caps\n"); } else RARCH_LOG ("DRM: ATOMIC caps set\n"); @@ -688,8 +679,7 @@ static bool init_drm(void) struct modeset_buf buf; buf.width = drm.current_mode->hdisplay; buf.height = drm.current_mode->vdisplay; - ret = modeset_create_dumbfb(drm.fd, &buf, 4, DRM_FORMAT_XRGB8888); - if (ret) + if (modeset_create_dumbfb(drm.fd, &buf, 4, DRM_FORMAT_XRGB8888)) { RARCH_ERR ("DRM: can't create dumb fb\n"); } @@ -742,10 +732,8 @@ static void *drm_gfx_init(const video_info_t *video, free(_drmvars); return NULL; } - else - { - RARCH_LOG ("DRM: Init successful.\n"); - } + + RARCH_LOG ("DRM: Init successful.\n"); _drmvars->kms_width = drm.current_mode->hdisplay; _drmvars->kms_height = drm.current_mode->vdisplay; diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c index a8268cf964..eeaa4a2687 100644 --- a/gfx/drivers_context/drm_ctx.c +++ b/gfx/drivers_context/drm_ctx.c @@ -19,7 +19,6 @@ */ #include -#include #include #include #include @@ -198,7 +197,7 @@ static struct drm_fb *drm_fb_get_from_bo(struct gbm_bo *bo) return fb; error: - RARCH_ERR("[KMS]: Failed to create FB: %s\n", strerror(errno)); + RARCH_ERR("[KMS]: Failed to create FB.\n"); free(fb); return NULL; } diff --git a/gfx/drivers_context/drm_go2_ctx.c b/gfx/drivers_context/drm_go2_ctx.c index b758137703..9d5286cd65 100644 --- a/gfx/drivers_context/drm_go2_ctx.c +++ b/gfx/drivers_context/drm_go2_ctx.c @@ -19,7 +19,6 @@ */ #include -#include #include #include #include diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c index 16f312ae39..9fc5ecd77d 100644 --- a/gfx/drivers_context/vc_egl_ctx.c +++ b/gfx/drivers_context/vc_egl_ctx.c @@ -16,7 +16,6 @@ */ #include -#include #include #include diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c index 3526b0d141..f6b0022c72 100644 --- a/input/drivers/wayland_input.c +++ b/input/drivers/wayland_input.c @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m index 7a7bd56426..95cccecd4e 100644 --- a/input/drivers_joypad/mfi_joypad.m +++ b/input/drivers_joypad/mfi_joypad.m @@ -17,7 +17,6 @@ #include #include #include -#include #include diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c index 16adbe4b1b..6c9a08e5e4 100644 --- a/input/drivers_joypad/parport_joypad.c +++ b/input/drivers_joypad/parport_joypad.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index 47f5622b98..3d01809bea 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 2faed5f1c7..8f49c0d393 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -24,7 +24,6 @@ #include #include #include -#include #include diff --git a/libretro-common/file/file_path_io.c b/libretro-common/file/file_path_io.c index ae2ac430f1..0003e785d8 100644 --- a/libretro-common/file/file_path_io.c +++ b/libretro-common/file/file_path_io.c @@ -24,7 +24,6 @@ #include #include #include -#include #include diff --git a/libretro-common/formats/image_transfer.c b/libretro-common/formats/image_transfer.c index 0e9a9fd63f..76759ef468 100644 --- a/libretro-common/formats/image_transfer.c +++ b/libretro-common/formats/image_transfer.c @@ -22,7 +22,8 @@ #include #include -#include + +#include #ifdef HAVE_RPNG #include diff --git a/libretro-common/streams/file_stream.c b/libretro-common/streams/file_stream.c index ae62f9aaae..0042f0330e 100644 --- a/libretro-common/streams/file_stream.c +++ b/libretro-common/streams/file_stream.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/retroarch.c b/retroarch.c index 3964d8b03d..db3046cb35 100644 --- a/retroarch.c +++ b/retroarch.c @@ -55,7 +55,6 @@ #include #include #include -#include #include #include diff --git a/runloop.c b/runloop.c index 456b62c959..01bfdf176a 100644 --- a/runloop.c +++ b/runloop.c @@ -57,7 +57,6 @@ #include #include #include -#include #include #include diff --git a/tasks/task_bluetooth.c b/tasks/task_bluetooth.c index 845bcbb29e..dd90dc9526 100644 --- a/tasks/task_bluetooth.c +++ b/tasks/task_bluetooth.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include diff --git a/tasks/task_content_disc.c b/tasks/task_content_disc.c index bd616a6702..9a01aa3813 100755 --- a/tasks/task_content_disc.c +++ b/tasks/task_content_disc.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c index 2f998beaf9..4ad9420187 100644 --- a/tasks/task_file_transfer.c +++ b/tasks/task_file_transfer.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include diff --git a/tasks/task_image.c b/tasks/task_image.c index 8ca499d872..ae8cdcc028 100644 --- a/tasks/task_image.c +++ b/tasks/task_image.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/tasks/task_save.c b/tasks/task_save.c index f07a9e36ed..74b4a06952 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -24,7 +24,6 @@ #else #include #endif -#include #include #include diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c index e55e17c702..767a71e3f1 100644 --- a/tasks/task_wifi.c +++ b/tasks/task_wifi.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include