From c57c4fbd1a2eae8dcf958250bbadb69fc6c4b8e8 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 10 Feb 2025 13:59:25 +0100
Subject: [PATCH] Style nits

---
 audio/audio_driver.h                          |   2 +-
 audio/drivers/alsathread.c                    |   6 +-
 audio/drivers/audioio.c                       |   4 +-
 audio/drivers/oss.c                           |   4 +-
 audio/drivers/ps2_audio.c                     |   4 +-
 audio/drivers/ps3_audio.c                     |   5 +-
 audio/drivers/psp_audio.c                     |   8 +-
 audio/drivers/sdl_audio.c                     |   8 +-
 audio/drivers/switch_audio.c                  |   8 +-
 audio/drivers/switch_libnx_audren_audio.c     |   4 +-
 audio/drivers/switch_thread_audio.c           |   6 +-
 audio/drivers/xaudio.c                        |   4 +-
 audio/drivers/xenon360_audio.c                |   6 +-
 configuration.h                               |   3 +-
 .../video_processor_v4l2.c                    |  50 ++++----
 input/drivers_hid/btstack_hid.c               |   5 +-
 input/drivers_hid/iohidmanager_hid.c          |   5 +-
 input/drivers_hid/wiiu_hid.c                  |  21 ++--
 input/include/hid_driver.h                    |   4 +-
 input/input_keymaps.c                         |  34 +----
 input/input_keymaps.h                         |   6 +-
 libretro-common/cdrom/cdrom.c                 |  38 +++---
 .../include/streams/memory_stream.h           |   2 +-
 libretro-common/streams/memory_stream.c       |  23 +---
 libretro-common/streams/rzip_stream.c         |  10 +-
 libretro-common/streams/stdin_stream.c        |  19 ++-
 libretro-common/string/stdstring.c            | 117 +++++++++---------
 menu/menu_entries.h                           |   2 +-
 28 files changed, 182 insertions(+), 226 deletions(-)

diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 41fb9f9d20..8e2492decc 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -110,7 +110,7 @@ typedef struct audio_driver
     * Unless said otherwise with set_nonblock_state(), all writes
     * are blocking, and it should block till it has written all frames.
     */
-   ssize_t (*write)(void *data, const void *buf, size_t len);
+   ssize_t (*write)(void *data, const void *s, size_t len);
 
    /**
     * Temporarily pauses the audio driver.
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index 938e170b2b..c9c13d21c7 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -157,7 +157,7 @@ error:
    return NULL;
 }
 
-static ssize_t alsa_thread_write(void *data, const void *buf, size_t len)
+static ssize_t alsa_thread_write(void *data, const void *s, size_t len)
 {
    ssize_t written = 0;
    alsa_thread_t *alsa = (alsa_thread_t*)data;
@@ -173,7 +173,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t len)
       avail           = FIFO_WRITE_AVAIL(alsa->info.buffer);
       written         = MIN(avail, len);
 
-      fifo_write(alsa->info.buffer, buf, written);
+      fifo_write(alsa->info.buffer, s, written);
       slock_unlock(alsa->info.fifo_lock);
    }
    else
@@ -196,7 +196,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t len)
          {
             size_t write_amt = MIN(len - written, avail);
             fifo_write(alsa->info.buffer,
-                  (const char*)buf + written, write_amt);
+                  (const char*)s + written, write_amt);
             slock_unlock(alsa->info.fifo_lock);
             written += write_amt;
          }
diff --git a/audio/drivers/audioio.c b/audio/drivers/audioio.c
index bec10582e5..910b5c6a24 100644
--- a/audio/drivers/audioio.c
+++ b/audio/drivers/audioio.c
@@ -82,7 +82,7 @@ error:
    return NULL;
 }
 
-static ssize_t audioio_write(void *data, const void *buf, size_t len)
+static ssize_t audioio_write(void *data, const void *s, size_t len)
 {
    ssize_t written;
    int *fd = (int*)data;
@@ -90,7 +90,7 @@ static ssize_t audioio_write(void *data, const void *buf, size_t len)
    if (len == 0)
       return 0;
 
-   if ((written = write(*fd, buf, len)) < 0)
+   if ((written = write(*fd, s, len)) < 0)
    {
       if (errno == EAGAIN && (fcntl(*fd, F_GETFL) & O_NONBLOCK))
          return 0;
diff --git a/audio/drivers/oss.c b/audio/drivers/oss.c
index 70cf801f97..1bda5b63fe 100644
--- a/audio/drivers/oss.c
+++ b/audio/drivers/oss.c
@@ -103,7 +103,7 @@ error:
    return NULL;
 }
 
-static ssize_t oss_write(void *data, const void *buf, size_t len)
+static ssize_t oss_write(void *data, const void *s, size_t len)
 {
    ssize_t ret;
    oss_audio_t *ossaudio  = (oss_audio_t*)data;
@@ -111,7 +111,7 @@ static ssize_t oss_write(void *data, const void *buf, size_t len)
    if (len == 0)
       return 0;
 
-   if ((ret = write(ossaudio->fd, buf, len)) < 0)
+   if ((ret = write(ossaudio->fd, s, len)) < 0)
    {
       if (errno == EAGAIN && (fcntl(ossaudio->fd, F_GETFL) & O_NONBLOCK))
          return 0;
diff --git a/audio/drivers/ps2_audio.c b/audio/drivers/ps2_audio.c
index d073d1aa76..4c841b09fe 100644
--- a/audio/drivers/ps2_audio.c
+++ b/audio/drivers/ps2_audio.c
@@ -71,12 +71,12 @@ static void ps2_audio_free(void *data)
    free(ps2);
 }
 
-static ssize_t ps2_audio_write(void *data, const void *buf, size_t len)
+static ssize_t ps2_audio_write(void *data, const void *s, size_t len)
 {
    ps2_audio_t* ps2 = (ps2_audio_t*)data;
    if (!ps2->running)
       return -1;
-   return audsrv_play_audio(buf, len);
+   return audsrv_play_audio(s, len);
 }
 
 static bool ps2_audio_alive(void *data)
diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
index eb2c9a08c8..9168629a68 100644
--- a/audio/drivers/ps3_audio.c
+++ b/audio/drivers/ps3_audio.c
@@ -142,7 +142,7 @@ static void *ps3_audio_init(const char *device,
    return data;
 }
 
-static ssize_t ps3_audio_write(void *data, const void *buf, size_t len)
+static ssize_t ps3_audio_write(void *data, const void *s, size_t len)
 {
    ps3_audio_t *aud = data;
 
@@ -156,9 +156,8 @@ static ssize_t ps3_audio_write(void *data, const void *buf, size_t len)
       sysLwCondWait(&aud->cond, 0);
 
    sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
-   fifo_write(aud->buffer, buf, len);
+   fifo_write(aud->buffer, s, len);
    sysLwMutexUnlock(&aud->lock);
-
    return len;
 }
 
diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c
index 7a2e29aa1a..9bd2089d7b 100644
--- a/audio/drivers/psp_audio.c
+++ b/audio/drivers/psp_audio.c
@@ -202,7 +202,7 @@ static void psp_audio_free(void *data)
 
 }
 
-static ssize_t psp_audio_write(void *data, const void *buf, size_t len)
+static ssize_t psp_audio_write(void *data, const void *s, size_t len)
 {
    psp_audio_t* psp     = (psp_audio_t*)data;
    uint16_t write_pos   = psp->write_pos;
@@ -227,14 +227,14 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t len)
    slock_lock(psp->fifo_lock);
    if ((write_pos + sampleCount) > AUDIO_BUFFER_SIZE)
    {
-      memcpy(psp->buffer + write_pos, buf,
+      memcpy(psp->buffer + write_pos, s,
             (AUDIO_BUFFER_SIZE - write_pos) * sizeof(uint32_t));
-      memcpy(psp->buffer, (uint32_t*) buf +
+      memcpy(psp->buffer, (uint32_t*)s +
             (AUDIO_BUFFER_SIZE - write_pos),
             (write_pos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t));
    }
    else
-      memcpy(psp->buffer + write_pos, buf, len);
+      memcpy(psp->buffer + write_pos, s, len);
 
    write_pos      += sampleCount;
    write_pos      &= AUDIO_BUFFER_SIZE_MASK;
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
index 3be72b7904..708cfee409 100644
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@@ -110,8 +110,6 @@ static void *sdl_audio_init(const char *device,
    sdl_audio_t *sdl             = NULL;
    uint32_t sdl_subsystem_flags = SDL_WasInit(0);
 
-   (void)device;
-
    /* Initialise audio subsystem, if required */
    if (sdl_subsystem_flags == 0)
    {
@@ -210,7 +208,7 @@ error:
    return NULL;
 }
 
-static ssize_t sdl_audio_write(void *data, const void *buf, size_t len)
+static ssize_t sdl_audio_write(void *data, const void *s, size_t len)
 {
    ssize_t ret      = 0;
    sdl_audio_t *sdl = (sdl_audio_t*)data;
@@ -222,7 +220,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t len)
       SDL_LockAudioDevice(sdl->speaker_device); /* Stop the SDL speaker thread from running */
       avail     = FIFO_WRITE_AVAIL(sdl->speaker_buffer);
       write_amt = (avail > len) ? len : avail; /* Enqueue as much data as we can */
-      fifo_write(sdl->speaker_buffer, buf, write_amt);
+      fifo_write(sdl->speaker_buffer, s, write_amt);
       SDL_UnlockAudioDevice(sdl->speaker_device); /* Let the speaker thread run again */
       ret       = write_amt; /* If the queue was full...well, too bad. */
    }
@@ -256,7 +254,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t len)
          else
          {
             size_t write_amt = len - written > avail ? avail : len - written;
-            fifo_write(sdl->speaker_buffer, (const char*)buf + written, write_amt);
+            fifo_write(sdl->speaker_buffer, (const char*)s + written, write_amt);
             /* Enqueue as many samples as we have available without overflowing the queue */
             SDL_UnlockAudioDevice(sdl->speaker_device); /* Let the SDL speaker thread run again */
             written += write_amt;
diff --git a/audio/drivers/switch_audio.c b/audio/drivers/switch_audio.c
index c622e8ac06..7a91b5aa5a 100644
--- a/audio/drivers/switch_audio.c
+++ b/audio/drivers/switch_audio.c
@@ -73,10 +73,10 @@ static size_t switch_audio_buffer_size(void *data)
 #endif
 }
 
-static ssize_t switch_audio_write(void *data, const void *buf, size_t len)
+static ssize_t switch_audio_write(void *data, const void *s, size_t len)
 {
    size_t to_write     = len;
-	switch_audio_t *swa = (switch_audio_t*) data;
+	switch_audio_t *swa = (switch_audio_t*)data;
 
    if (!swa)
       return -1;
@@ -125,9 +125,9 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t len)
 		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
 
 #ifndef HAVE_LIBNX
-   memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+   memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, s, to_write);
 #else
-   memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
+   memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, s, to_write);
 #endif
 	swa->current_buffer->data_size   += to_write;
 	swa->current_buffer->buffer_size  = switch_audio_buffer_size(NULL);
diff --git a/audio/drivers/switch_libnx_audren_audio.c b/audio/drivers/switch_libnx_audren_audio.c
index 3f445eeeba..e638da66ee 100644
--- a/audio/drivers/switch_libnx_audren_audio.c
+++ b/audio/drivers/switch_libnx_audren_audio.c
@@ -186,7 +186,7 @@ static ssize_t libnx_audren_audio_get_free_wavebuf_idx(libnx_audren_t* aud)
 }
 
 static size_t libnx_audren_audio_append(
-      libnx_audren_t* aud, const void *buf, size_t len)
+      libnx_audren_t* aud, const void *s, size_t len)
 {
    void *dstbuf     = NULL;
    ssize_t free_idx = -1;
@@ -206,7 +206,7 @@ static size_t libnx_audren_audio_append(
       len = aud->buffer_size - aud->current_size;
 
    dstbuf = aud->current_pool_ptr + aud->current_size;
-   memcpy(dstbuf, buf, len);
+   memcpy(dstbuf, s, len);
    armDCacheFlush(dstbuf, len);
 
    aud->current_size += len;
diff --git a/audio/drivers/switch_thread_audio.c b/audio/drivers/switch_thread_audio.c
index 37491f86f1..b11edf976b 100644
--- a/audio/drivers/switch_thread_audio.c
+++ b/audio/drivers/switch_thread_audio.c
@@ -338,7 +338,7 @@ static void switch_thread_audio_free(void *data)
    swa = NULL;
 }
 
-static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t len)
+static ssize_t switch_thread_audio_write(void *data, const void *s, size_t len)
 {
    size_t avail, written;
    switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
@@ -352,7 +352,7 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t len
       avail = FIFO_WRITE_AVAIL(swa->fifo);
       written = MIN(avail, len);
       if (written > 0)
-         fifo_write(swa->fifo, buf, written);
+         fifo_write(swa->fifo, s, written);
       compat_mutex_unlock(&swa->fifoLock);
    }
    else
@@ -373,7 +373,7 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t len
          else
          {
             size_t write_amt = MIN(len - written, avail);
-            fifo_write(swa->fifo, (const char*)buf + written, write_amt);
+            fifo_write(swa->fifo, (const char*)s + written, write_amt);
             compat_mutex_unlock(&swa->fifoLock);
             written += write_amt;
          }
diff --git a/audio/drivers/xaudio.c b/audio/drivers/xaudio.c
index 0e0cc6508e..ac9f85e81a 100644
--- a/audio/drivers/xaudio.c
+++ b/audio/drivers/xaudio.c
@@ -341,12 +341,12 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency,
    return xa;
 }
 
-static ssize_t xa_write(void *data, const void *buf, size_t len)
+static ssize_t xa_write(void *data, const void *s, size_t len)
 {
    unsigned bytes        = len;
    xa_t *xa              = (xa_t*)data;
    xaudio2_t *handle     = xa->xa;
-   const uint8_t *buffer = (const uint8_t*)buf;
+   const uint8_t *buffer = (const uint8_t*)s;
 
    if (xa->flags & XA2_FLAG_NONBLOCK)
    {
diff --git a/audio/drivers/xenon360_audio.c b/audio/drivers/xenon360_audio.c
index 04bce07d82..c6f38b8f4d 100644
--- a/audio/drivers/xenon360_audio.c
+++ b/audio/drivers/xenon360_audio.c
@@ -57,11 +57,11 @@ static INLINE uint32_t bswap_32(uint32_t val)
       ((val >> 8) & 0xff00) | ((val << 8) & 0xff0000);
 }
 
-static ssize_t xenon360_audio_write(void *data, const void *buf, size_t len)
+static ssize_t xenon360_audio_write(void *data, const void *s, size_t len)
 {
    size_t written = 0, i;
-   const uint32_t *in_buf = buf;
-   xenon_audio_t *xa = data;
+   const uint32_t *in_buf = s;
+   xenon_audio_t *xa      = data;
 
    for (i = 0; i < (len >> 2); i++)
       xa->buffer[i] = bswap_32(in_buf[i]);
diff --git a/configuration.h b/configuration.h
index 8d0788c375..c286af6230 100644
--- a/configuration.h
+++ b/configuration.h
@@ -1272,8 +1272,7 @@ bool config_load_remap(const char *directory_input_remapping,
  **/
 
 void config_get_autoconf_profile_filename(
-      const char *device_name, unsigned user,
-      char *buf, size_t len_buf);
+      const char *device_name, unsigned user, char *s, size_t len);
 /**
  * config_save_autoconf_profile:
  * @device_name       : Input device name
diff --git a/cores/libretro-video-processor/video_processor_v4l2.c b/cores/libretro-video-processor/video_processor_v4l2.c
index b8a5695b21..1056162bb0 100644
--- a/cores/libretro-video-processor/video_processor_v4l2.c
+++ b/cores/libretro-video-processor/video_processor_v4l2.c
@@ -146,17 +146,14 @@ static void audio_callback(void)
 static void audio_set_state(bool enable) { }
 #endif
 
-static void
-appendstr(char *dst, const char *src, size_t dstsize)
+static void appendstr(char *s, const char *in, size_t len)
 {
-   size_t resid = dstsize - (strlen(dst) + 1);
-   if (resid == 0)
-      return;
-   strncat(dst, src, resid);
+   size_t resid = len - (strlen(s) + 1);
+   if (resid != 0)
+      strncat(s, in, resid);
 }
 
-static void
-enumerate_video_devices(char *buf, size_t buflen)
+static void enumerate_video_devices(char *s, size_t len)
 {
 #ifdef HAVE_UDEV
    int ndevs;
@@ -167,9 +164,8 @@ enumerate_video_devices(char *buf, size_t buflen)
    struct udev *udev = NULL;
 #endif
 
-   memset(buf, 0, buflen);
-
-   appendstr(buf, "Video capture device; ", buflen);
+   memset(s, 0, len);
+   appendstr(s, "Video capture device; ", len);
 
 #ifdef HAVE_UDEV
    /* Get a list of devices matching the "video4linux" subsystem from udev */
@@ -211,8 +207,8 @@ enumerate_video_devices(char *buf, size_t buflen)
       if (strncmp(name, "/dev/video", strlen("/dev/video")) == 0)
       {
          if (ndevs > 0)
-            appendstr(buf, "|", buflen);
-         appendstr(buf, name, buflen);
+            appendstr(s, "|", len);
+         appendstr(s, name, len);
          ndevs++;
       }
 
@@ -223,23 +219,22 @@ enumerate_video_devices(char *buf, size_t buflen)
    udev_unref(udev);
 #else
    /* Just return a few options. We'll fail later if the device is not found. */
-   appendstr(buf, "/dev/video0|/dev/video1|/dev/video2|/dev/video3", buflen);
+   appendstr(s, "/dev/video0|/dev/video1|/dev/video2|/dev/video3", len);
 #endif
-
 }
 
-static void
-enumerate_audio_devices(char *buf, size_t buflen)
+static void enumerate_audio_devices(char *s, size_t len)
 {
-   memset(buf, 0, buflen);
-
-   appendstr(buf, "Audio capture device; ", buflen);
-
 #ifdef HAVE_ALSA
+   int ndevs;
    void **hints, **n;
    char *ioid, *name;
-   int ndevs;
+#endif
 
+   memset(s, 0, len);
+   appendstr(s, "Audio capture device; ", len);
+
+#ifdef HAVE_ALSA
    if (snd_device_name_hint(-1, "pcm", &hints) < 0)
       return;
 
@@ -248,13 +243,14 @@ enumerate_audio_devices(char *buf, size_t buflen)
    {
       name = snd_device_name_get_hint(*n, "NAME");
       ioid = snd_device_name_get_hint(*n, "IOID");
-      if ((ioid == NULL || string_is_equal(ioid, "Input")) &&
-          (!strncmp(name, "hw:", strlen("hw:")) ||
-           !strncmp(name, "default:", strlen("default:"))))
+      if (   (ioid == NULL
+           || string_is_equal(ioid, "Input"))
+           && (   !strncmp(name, "hw:", strlen("hw:"))
+           ||     !strncmp(name, "default:", strlen("default:"))))
       {
          if (ndevs > 0)
-            appendstr(buf, "|", buflen);
-         appendstr(buf, name, buflen);
+            appendstr(s, "|", len);
+         appendstr(s, name, len);
          ++ndevs;
       }
       free(name);
diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c
index e9bcbd0c83..865de315f9 100644
--- a/input/drivers_hid/btstack_hid.c
+++ b/input/drivers_hid/btstack_hid.c
@@ -766,12 +766,11 @@ static void btpad_increment_position(uint32_t *ptr)
 }
 
 static void btpad_connection_send_control(void *data,
-      uint8_t* data_buf, size_t len)
+      uint8_t *s, size_t len)
 {
    struct btstack_hid_adapter *connection = (struct btstack_hid_adapter*)data;
-
    if (connection)
-      bt_send_l2cap_ptr(connection->channels[0], data_buf, len);
+      bt_send_l2cap_ptr(connection->channels[0], s, len);
 }
 
 static void btpad_queue_process_cmd(struct btpad_queue_command *cmd)
diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c
index 0d347d09d3..58fb876177 100644
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@@ -585,13 +585,12 @@ static uint32_t iohidmanager_hid_device_get_location_id(IOHIDDeviceRef device)
 }
 
 static void iohidmanager_hid_device_get_product_string(
-      IOHIDDeviceRef device, char *buf, size_t len)
+      IOHIDDeviceRef device, char *s, size_t len)
 {
    CFStringRef ref = (CFStringRef)
       IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
-
    if (ref)
-      CFStringGetCString(ref, buf, len, kCFStringEncodingUTF8);
+      CFStringGetCString(ref, s, len, kCFStringEncodingUTF8);
 }
 
 static void iohidmanager_hid_device_add_autodetect(unsigned idx,
diff --git a/input/drivers_hid/wiiu_hid.c b/input/drivers_hid/wiiu_hid.c
index 8218632441..0acf8fa0ab 100644
--- a/input/drivers_hid/wiiu_hid.c
+++ b/input/drivers_hid/wiiu_hid.c
@@ -147,8 +147,7 @@ static int16_t wiiu_hid_joypad_axis(void *data, unsigned slot, uint32_t joyaxis)
    return 0;
 }
 
-static int16_t wiiu_hid_joypad_state(
-      void *data,
+static int16_t wiiu_hid_joypad_state(void *data,
       rarch_joypad_info_t *joypad_info,
       const void *binds_data,
       unsigned port)
@@ -748,7 +747,7 @@ static void wiiu_hid_poll(void *data)
    synchronized_process_adapters(hid);
 }
 
-static void wiiu_hid_send_control(void *data, uint8_t *buf, size_t len)
+static void wiiu_hid_send_control(void *data, uint8_t *s, size_t len)
 {
    wiiu_adapter_t *adapter = (wiiu_adapter_t *)data;
    int32_t result;
@@ -760,7 +759,7 @@ static void wiiu_hid_send_control(void *data, uint8_t *buf, size_t len)
    }
 
    memset(adapter->tx_buffer, 0, adapter->tx_size);
-   memcpy(adapter->tx_buffer, buf, len);
+   memcpy(adapter->tx_buffer, s, len);
 
    /* From testing, HIDWrite returns an error that looks like it's two
     * int16_t's bitmasked together. For example, one error I saw when trying
@@ -775,12 +774,12 @@ static void wiiu_hid_send_control(void *data, uint8_t *buf, size_t len)
    }
 }
 
-static void _fixup_report_buffer(uint8_t **buffer, uint8_t report_id, size_t *length)
+static void _fixup_report_buffer(uint8_t **s, uint8_t report_id, size_t *len)
 {
-   if ((*buffer)[0] == report_id)
+   if ((*s)[0] == report_id)
    {
-      *buffer = (*buffer)+ 1;
-      *length = *length - 1;
+      *s   = (*s)+ 1;
+      *len = *len - 1;
    }
 }
 
@@ -804,7 +803,8 @@ static int32_t wiiu_hid_set_report(void *data, uint8_t report_type,
          NULL, NULL);
 }
 
-static int32_t wiiu_hid_get_report(void *handle, uint8_t report_type, uint8_t report_id, uint8_t *report_data, size_t report_length)
+static int32_t wiiu_hid_get_report(void *handle, uint8_t report_type, uint8_t report_id,
+      uint8_t *report_data, size_t report_length)
 {
    wiiu_adapter_t *adapter = (wiiu_adapter_t *)handle;
    if (!adapter || report_length > adapter->tx_size)
@@ -860,7 +860,8 @@ static int32_t wiiu_hid_read(void *data, void *buffer, size_t len)
    return result;
 }
 
-static void wiiu_hid_init_cachealigned_buffer(int32_t min_size, uint8_t **out_buf_ptr, int32_t *actual_size)
+static void wiiu_hid_init_cachealigned_buffer(int32_t min_size,
+      uint8_t **out_buf_ptr, int32_t *actual_size)
 {
    *actual_size = (min_size + 0x3f) & ~0x3f;
    *out_buf_ptr = wiiu_hid_alloc_zeroed(64, *actual_size);
diff --git a/input/include/hid_driver.h b/input/include/hid_driver.h
index b7c6d953bc..c3c6d1441b 100644
--- a/input/include/hid_driver.h
+++ b/input/include/hid_driver.h
@@ -49,12 +49,12 @@ struct hid_driver
    bool (*set_rumble)(void *handle, unsigned pad, enum retro_rumble_effect effect, uint16_t);
    const char *(*name)(void *handle, unsigned pad);
    const char *ident;
-   void (*send_control)(void *handle, uint8_t *buf, size_t len);
+   void (*send_control)(void *handle, uint8_t *s, size_t len);
    int32_t (*set_report)(void *handle, uint8_t report_type, uint8_t report_id, uint8_t *data, size_t len);
    int32_t (*get_report)(void *handle, uint8_t report_type, uint8_t report_id, uint8_t *data, size_t len);
    int32_t (*set_idle)(void *handle, uint8_t amount);
    int32_t (*set_protocol)(void *handle, uint8_t protocol);
-   int32_t (*read)(void *handle, void *buf, size_t len);
+   int32_t (*read)(void *handle, void *s, size_t len);
 };
 
 #endif /* HID_DRIVER_H__ */
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 83e77136d8..5afaab5ad9 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -2091,12 +2091,6 @@ enum retro_key rarch_keysym_lut[RETROK_LAST];
 static unsigned *rarch_keysym_rlut           = NULL;
 static unsigned rarch_keysym_rlut_size       = 0;
 
-/**
- * input_keymaps_init_keyboard_lut:
- * @map                   : Keyboard map.
- *
- * Initializes and sets the keyboard layout to a keyboard map (@map).
- **/
 void input_keymaps_init_keyboard_lut(const struct rarch_key_map *map)
 {
    const struct rarch_key_map *map_start = map;
@@ -2124,15 +2118,6 @@ void input_keymaps_init_keyboard_lut(const struct rarch_key_map *map)
       rarch_keysym_rlut_size = 0;
 }
 
-/**
- * input_keymaps_translate_keysym_to_rk:
- * @sym                   : Key symbol.
- *
- * Translates a key symbol from the keyboard layout table
- * to an associated retro key identifier.
- *
- * Returns: Retro key identifier.
- **/
 enum retro_key input_keymaps_translate_keysym_to_rk(unsigned sym)
 {
    unsigned i;
@@ -2153,25 +2138,16 @@ enum retro_key input_keymaps_translate_keysym_to_rk(unsigned sym)
    return RETROK_UNKNOWN;
 }
 
-/**
- * input_keymaps_translate_rk_to_str:
- * @key                   : Retro key identifier.
- * @buf                   : Buffer.
- * @size                  : Size of @buf.
- *
- * Translates a retro key identifier to a human-readable
- * identifier string.
- **/
-void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t len)
+void input_keymaps_translate_rk_to_str(enum retro_key key, char *s, size_t len)
 {
    unsigned i;
 
-   *buf = '\0';
+   *s = '\0';
 
    if (key >= RETROK_a && key <= RETROK_z)
    {
-      buf[0] = (key - RETROK_a) + 'a';
-      buf[1] = '\0';
+      s[0] = (key - RETROK_a) + 'a';
+      s[1] = '\0';
       return;
    }
 
@@ -2180,7 +2156,7 @@ void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t len
       if (input_config_key_map[i].key != key)
          continue;
 
-      strlcpy(buf, input_config_key_map[i].str, len);
+      strlcpy(s, input_config_key_map[i].str, len);
       break;
    }
 }
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index 473a708d3a..fecbe00abd 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -223,13 +223,13 @@ enum retro_key input_keymaps_translate_keysym_to_rk(unsigned sym);
 /**
  * input_keymaps_translate_rk_to_str:
  * @key                   : Retro key identifier.
- * @buf                   : Buffer.
- * @len                   : Size of @buf.
+ * @s                     : Buffer.
+ * @len                   : Size of @s.
  *
  * Translates a retro key identifier to a human-readable
  * identifier string.
  **/
-void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t len);
+void input_keymaps_translate_rk_to_str(enum retro_key key, char *s, size_t len);
 
 /**
  * input_translate_rk_to_ascii:
diff --git a/libretro-common/cdrom/cdrom.c b/libretro-common/cdrom/cdrom.c
index c507eadc0f..2ff8aba538 100644
--- a/libretro-common/cdrom/cdrom.c
+++ b/libretro-common/cdrom/cdrom.c
@@ -99,7 +99,7 @@ void increment_msf(unsigned char *min, unsigned char *sec, unsigned char *frame)
 }
 
 #ifdef CDROM_DEBUG
-static void cdrom_print_sense_data(const unsigned char *sense, size_t len)
+static void cdrom_print_sense_data(const unsigned char *s, size_t len)
 {
    unsigned i;
    const char *sense_key_text = NULL;
@@ -114,20 +114,20 @@ static void cdrom_print_sense_data(const unsigned char *sense, size_t len)
       return;
    }
 
-   key  = sense[2] & 0xF;
-   asc  = sense[12];
-   ascq = sense[13];
+   key  = s[2] & 0xF;
+   asc  = s[12];
+   ascq = s[13];
 
    printf("[CDROM] Sense Data: ");
 
    for (i = 0; i < MIN(len, 16); i++)
-      printf("%02X ", sense[i]);
+      printf("%02X ", s[i]);
 
    printf("\n");
 
-   if (sense[0] == 0x70)
+   if (s[0] == 0x70)
       printf("[CDROM] CURRENT ERROR:\n");
-   if (sense[0] == 0x71)
+   if (s[0] == 0x71)
       printf("[CDROM] DEFERRED ERROR:\n");
 
    switch (key)
@@ -371,17 +371,17 @@ static int cdrom_send_command_linux(const libretro_vfs_implementation_file *stre
 #endif
 
 static int cdrom_send_command(libretro_vfs_implementation_file *stream, CDROM_CMD_Direction dir,
-      void *buf, size_t len, unsigned char *cmd, size_t cmd_len, size_t skip)
+      void *s, size_t len, unsigned char *cmd, size_t cmd_len, size_t skip)
 {
-   unsigned char *xfer_buf = NULL;
-   unsigned char *xfer_buf_pos = xfer_buf;
-   unsigned char sense[CDROM_MAX_SENSE_BYTES] = {0};
-   unsigned char retries_left = CDROM_MAX_RETRIES;
    int i, rv = 0;
    int frames = 1;
+   unsigned char *xfer_buf     = NULL;
+   unsigned char *xfer_buf_pos = xfer_buf;
+   unsigned char sense[CDROM_MAX_SENSE_BYTES] = {0};
+   unsigned char retries_left  = CDROM_MAX_RETRIES;
    size_t padded_req_bytes;
-   size_t copied_bytes = 0;
-   bool read_cd = false;
+   size_t copied_bytes         = 0;
+   bool read_cd                = false;
 
    if (!cmd || cmd_len == 0 || cmd_len < CDROM_MIN_BUFSIZE)
       return 1;
@@ -491,13 +491,13 @@ retry:
       {
          rv = 0;
 
-         if (buf)
+         if (s)
          {
 #if 0
             printf("offsetting %" PRId64 " from buf, copying at xfer_buf offset %" PRId64 ", copying %" PRId64 " bytes\n", copied_bytes, (xfer_buf_pos + skip) - xfer_buf, copy_len);
             fflush(stdout);
 #endif
-            memcpy((char*)buf + copied_bytes, xfer_buf_pos + skip, copy_len);
+            memcpy((char*)s + copied_bytes, xfer_buf_pos + skip, copy_len);
             copied_bytes += copy_len;
 
             if (read_cd && !cached_read && request_len >= 2352)
@@ -570,7 +570,6 @@ retry:
 
    if (xfer_buf)
       memalign_free(xfer_buf);
-
    return rv;
 }
 
@@ -1168,7 +1167,10 @@ int cdrom_get_inquiry(libretro_vfs_implementation_file *stream, char *s, size_t
    return 0;
 }
 
-int cdrom_read(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts, unsigned char min, unsigned char sec, unsigned char frame, void *s, size_t len, size_t skip)
+int cdrom_read(libretro_vfs_implementation_file *stream,
+      cdrom_group_timeouts_t *timeouts, unsigned char min,
+      unsigned char sec, unsigned char frame, void *s,
+      size_t len, size_t skip)
 {
    /* MMC Command: READ CD MSF */
    unsigned char cdb[] = {0xB9, 0, 0, 0, 0, 0, 0, 0, 0, 0xF8, 0, 0};
diff --git a/libretro-common/include/streams/memory_stream.h b/libretro-common/include/streams/memory_stream.h
index 2c6f3fcd68..3f29b8f3d6 100644
--- a/libretro-common/include/streams/memory_stream.h
+++ b/libretro-common/include/streams/memory_stream.h
@@ -44,7 +44,7 @@ int memstream_getc(memstream_t *stream);
 
 void memstream_putc(memstream_t *stream, int c);
 
-char *memstream_gets(memstream_t *stream, char *buffer, size_t len);
+char *memstream_gets(memstream_t *stream, char *s, size_t len);
 
 uint64_t memstream_pos(memstream_t *stream);
 
diff --git a/libretro-common/streams/memory_stream.c b/libretro-common/streams/memory_stream.c
index 2aa1c8081b..bbbf84b4c8 100644
--- a/libretro-common/streams/memory_stream.c
+++ b/libretro-common/streams/memory_stream.c
@@ -40,15 +40,10 @@ struct memstream
    unsigned writing;
 };
 
-void memstream_set_buffer(uint8_t *buffer, uint64_t size)
+void memstream_set_buffer(uint8_t *s, uint64_t len)
 {
-   g_buffer = buffer;
-   g_size   = size;
-}
-
-uint64_t memstream_get_last_size(void)
-{
-   return last_file_size;
+   g_buffer = s;
+   g_size   = len;
 }
 
 memstream_t *memstream_open(unsigned writing)
@@ -158,15 +153,9 @@ void memstream_rewind(memstream_t *stream)
    memstream_seek(stream, 0L, SEEK_SET);
 }
 
-uint64_t memstream_pos(memstream_t *stream)
-{
-   return stream->ptr;
-}
-
-char *memstream_gets(memstream_t *stream, char *buffer, size_t len)
-{
-   return NULL;
-}
+uint64_t memstream_pos(memstream_t *stream) { return stream->ptr; }
+char *memstream_gets(memstream_t *stream, char *s, size_t len) { return NULL; }
+uint64_t memstream_get_last_size(void) { return last_file_size; }
 
 int memstream_getc(memstream_t *stream)
 {
diff --git a/libretro-common/streams/rzip_stream.c b/libretro-common/streams/rzip_stream.c
index e4058b9d22..61dfe9bceb 100644
--- a/libretro-common/streams/rzip_stream.c
+++ b/libretro-common/streams/rzip_stream.c
@@ -647,20 +647,20 @@ char* rzipstream_gets(rzipstream_t *stream, char *s, size_t len)
  * - 'buf' will be allocated and must be free()'d manually.
  * - Allocated 'buf' size is equal to 'len'.
  * Returns false in the event of an error */
-bool rzipstream_read_file(const char *path, void **buf, int64_t *len)
+bool rzipstream_read_file(const char *path, void **s, int64_t *len)
 {
    int64_t bytes_read       = 0;
    void *content_buf        = NULL;
    int64_t content_buf_size = 0;
    rzipstream_t *stream     = NULL;
 
-   if (!buf)
+   if (!s)
       return false;
 
    /* Attempt to open file */
    if (!(stream = rzipstream_open(path, RETRO_VFS_FILE_ACCESS_READ)))
    {
-      *buf = NULL;
+      *s = NULL;
       return false;
    }
 
@@ -689,7 +689,7 @@ bool rzipstream_read_file(const char *path, void **buf, int64_t *len)
    ((char*)content_buf)[bytes_read] = '\0';
 
    /* Assign buffer */
-   *buf = content_buf;
+   *s = content_buf;
 
    /* Assign length value, if required */
    if (len)
@@ -709,7 +709,7 @@ error:
    if (len)
       *len = -1;
 
-   *buf = NULL;
+   *s = NULL;
 
    return false;
 }
diff --git a/libretro-common/streams/stdin_stream.c b/libretro-common/streams/stdin_stream.c
index a0800915fc..417c7f20fa 100644
--- a/libretro-common/streams/stdin_stream.c
+++ b/libretro-common/streams/stdin_stream.c
@@ -39,9 +39,9 @@
 #include <streams/stdin_stream.h>
 
 #if (defined(_WIN32) && defined(_XBOX)) || defined(__WINRT__) || !defined(__PSL1GHT__) && defined(__PS3__)
-size_t read_stdin(char *buf, size_t len) { return 0; } /* not implemented */
+size_t read_stdin(char *s, size_t len) { return 0; } /* not implemented */
 #elif defined(_WIN32)
-size_t read_stdin(char *buf, size_t len)
+size_t read_stdin(char *s, size_t len)
 {
    DWORD i;
    DWORD has_read = 0;
@@ -104,12 +104,12 @@ size_t read_stdin(char *buf, size_t len)
    if (avail > len)
       avail = len;
 
-   if (!ReadFile(hnd, buf, avail, &has_read, NULL))
+   if (!ReadFile(hnd, s, avail, &has_read, NULL))
       return 0;
 
    for (i = 0; i < has_read; i++)
-      if (buf[i] == '\r')
-         buf[i] = '\n';
+      if (s[i] == '\r')
+         s[i] = '\n';
 
    /* Console won't echo for us while in non-line mode,
     * so do it manually ... */
@@ -119,22 +119,21 @@ size_t read_stdin(char *buf, size_t len)
       if (hnd_out != INVALID_HANDLE_VALUE)
       {
          DWORD has_written;
-         WriteConsole(hnd_out, buf, has_read, &has_written, NULL);
+         WriteConsole(hnd_out, s, has_read, &has_written, NULL);
       }
    }
-
    return has_read;
 }
 #else
-size_t read_stdin(char *buf, size_t len)
+size_t read_stdin(char *s, size_t len)
 {
    size_t has_read = 0;
    while (len)
    {
-      ssize_t ret = read(STDIN_FILENO, buf, len);
+      ssize_t ret = read(STDIN_FILENO, s, len);
       if (ret <= 0)
          break;
-      buf      += ret;
+      s        += ret;
       has_read += ret;
       len      -= ret;
    }
diff --git a/libretro-common/string/stdstring.c b/libretro-common/string/stdstring.c
index 62c5cb9369..e925adadaf 100644
--- a/libretro-common/string/stdstring.c
+++ b/libretro-common/string/stdstring.c
@@ -189,8 +189,8 @@ char *string_trim_whitespace(char *const s)
 
 /**
  * word_wrap:
- * @dst                : pointer to destination buffer.
- * @dst_size           : size of destination buffer.
+ * @s                  : pointer to destination buffer.
+ * @len                : size of destination buffer.
  * @src                : pointer to input string.
  * @line_width         : max number of characters per line.
  * @wideglyph_width    : not used, but is necessary to keep
@@ -198,8 +198,8 @@ char *string_trim_whitespace(char *const s)
  * @max_lines          : max lines of destination string.
  *                       0 means no limit.
  *
- * Wraps string specified by 'src' to destination buffer
- * specified by 'dst' and 'dst_size'.
+ * Wraps string specified by @src to destination buffer
+ * specified by @s and @len.
  * This function assumes that all glyphs in the string
  * have an on-screen pixel width similar to that of
  * regular Latin characters - i.e. it will not wrap
@@ -207,7 +207,7 @@ char *string_trim_whitespace(char *const s)
  * characters (e.g. CJK languages, emojis, etc.).
  **/
 size_t word_wrap(
-      char *dst,       size_t dst_size,
+      char *s,         size_t len,
       const char *src, size_t src_len,
       int line_width,  int wideglyph_width, unsigned max_lines)
 {
@@ -217,13 +217,13 @@ size_t word_wrap(
    const char *src_end = src + src_len;
 
    /* Prevent buffer overflow */
-   if (dst_size < src_len + 1)
+   if (len < src_len + 1)
       return 0;
 
    /* Early return if src string length is less
     * than line width */
    if (src_len < (size_t)line_width)
-      return strlcpy(dst, src, dst_size);
+      return strlcpy(s, src, len);
 
    while (*src != '\0')
    {
@@ -231,7 +231,7 @@ size_t word_wrap(
       counter++;
 
       if (*src == ' ')
-         last_space = dst; /* Remember the location of the whitespace */
+         last_space = s; /* Remember the location of the whitespace */
       else if (*src == '\n')
       {
          /* If newlines embedded in the input,
@@ -242,11 +242,11 @@ size_t word_wrap(
          /* Early return if remaining src string
           * length is less than line width */
          if (src_end - src <= line_width)
-            return strlcpy(dst, src, dst_size);
+            return strlcpy(s, src, len);
      }
 
       while (char_len--)
-         *dst++ = *src++;
+         *s++ = *src++;
 
       if (counter >= (unsigned)line_width)
       {
@@ -259,26 +259,26 @@ size_t word_wrap(
             *last_space = '\n';
             lines++;
 
-            src        -= dst - last_space - 1;
-            dst         = last_space + 1;
+            src        -= s - last_space - 1;
+            s           = last_space + 1;
             last_space  = NULL;
 
             /* Early return if remaining src string
              * length is less than line width */
             if (src_end - src < line_width)
-               return strlcpy(dst, src, dst_size);
+               return strlcpy(s, src, len);
          }
       }
    }
 
-   *dst = '\0';
+   *s = '\0';
    return 0;
 }
 
 /**
  * word_wrap_wideglyph:
  * @dst                : pointer to destination buffer.
- * @dst_size           : size of destination buffer.
+ * @len                : size of destination buffer.
  * @src                : pointer to input string.
  * @line_width         : max number of characters per line.
  * @wideglyph_width    : effective width of 'wide' Unicode glyphs.
@@ -296,7 +296,7 @@ size_t word_wrap(
  *                       0 means no limit.
  *
  * Wraps string specified by @src to destination buffer
- * specified by @dst and @dst_size.
+ * specified by @dst and @len.
  * This function assumes that all glyphs in the string
  * are:
  * - EITHER 'non-wide' Unicode glyphs, with an on-screen
@@ -308,7 +308,7 @@ size_t word_wrap(
  * on-screen pixel width deviates greatly from the set
  * @wideglyph_width value.
  **/
-size_t word_wrap_wideglyph(char *dst, size_t dst_size,
+size_t word_wrap_wideglyph(char *s, size_t len,
       const char *src, size_t src_len, int line_width,
       int wideglyph_width, unsigned max_lines)
 {
@@ -344,7 +344,7 @@ size_t word_wrap_wideglyph(char *dst, size_t dst_size,
    /* Early return if src string length is less
     * than line width */
    if (src_end - src < line_width)
-      return strlcpy(dst, src, dst_size);
+      return strlcpy(s, src, len);
 
    while (*src != '\0')
    {
@@ -352,11 +352,11 @@ size_t word_wrap_wideglyph(char *dst, size_t dst_size,
       counter_normalized += 100;
 
       /* Prevent buffer overflow */
-      if (char_len >= dst_size)
+      if (char_len >= len)
          break;
 
       if (*src == ' ')
-         lastspace          = dst; /* Remember the location of the whitespace */
+         lastspace          = s; /* Remember the location of the whitespace */
       else if (*src == '\n')
       {
          /* If newlines embedded in the input,
@@ -367,19 +367,19 @@ size_t word_wrap_wideglyph(char *dst, size_t dst_size,
          /* Early return if remaining src string
           * length is less than line width */
          if (src_end - src <= line_width)
-            return strlcpy(dst, src, dst_size);
+            return strlcpy(s, src, len);
       }
       else if (char_len >= 3)
       {
          /* Remember the location of the first byte
           * whose length as UTF-8 >= 3*/
-         lastwideglyph       = dst;
+         lastwideglyph       = s;
          counter_normalized += additional_counter_normalized;
       }
 
-      dst_size -= char_len;
+      len -= char_len;
       while (char_len--)
-         *dst++ = *src++;
+         *s++ = *src++;
 
       if (counter_normalized >= (unsigned)line_width_normalized)
       {
@@ -392,14 +392,14 @@ size_t word_wrap_wideglyph(char *dst, size_t dst_size,
             /* Insert newline character */
             *lastwideglyph = '\n';
             lines++;
-            src           -= dst - lastwideglyph;
-            dst            = lastwideglyph + 1;
+            src           -= s - lastwideglyph;
+            s              = lastwideglyph + 1;
             lastwideglyph  = NULL;
 
             /* Early return if remaining src string
              * length is less than line width */
             if (src_end - src <= line_width)
-               return strlcpy(dst, src, dst_size);
+               return strlcpy(s, src, len);
          }
          else if (lastspace)
          {
@@ -407,19 +407,19 @@ size_t word_wrap_wideglyph(char *dst, size_t dst_size,
              * with newline character */
             *lastspace = '\n';
             lines++;
-            src       -= dst - lastspace - 1;
-            dst        = lastspace + 1;
+            src       -= s - lastspace - 1;
+            s          = lastspace + 1;
             lastspace  = NULL;
 
             /* Early return if remaining src string
              * length is less than line width */
             if (src_end - src < line_width)
-               return strlcpy(dst, src, dst_size);
+               return strlcpy(s, src, len);
          }
       }
    }
 
-   *dst = '\0';
+   *s = '\0';
    return 0;
 }
 
@@ -455,7 +455,6 @@ char* string_tokenize(char **str, const char *delim)
    if (!str || string_is_empty(delim))
       return NULL;
 
-
    /* Note: we don't check string_is_empty() here,
     * empty strings are valid */
    if (!(str_ptr = *str))
@@ -483,16 +482,16 @@ char* string_tokenize(char **str, const char *delim)
 
 /**
  * string_remove_all_chars:
- * @str                : input string (must be non-NULL, otherwise UB)
+ * @s                 : input string (must be non-NULL, otherwise UB)
  *
  * Leaf function.
  *
- * Removes every instance of character @c from @str
+ * Removes every instance of character @c from @s
  **/
-void string_remove_all_chars(char *str, char c)
+void string_remove_all_chars(char *s, char c)
 {
-   char *read_ptr  = str;
-   char *write_ptr = str;
+   char *read_ptr  = s;
+   char *write_ptr = s;
 
    while (*read_ptr != '\0')
    {
@@ -506,16 +505,16 @@ void string_remove_all_chars(char *str, char c)
 
 /**
  * string_replace_all_chars:
- * @str                : input string (must be non-NULL, otherwise UB)
+ * @s                  : input string (must be non-NULL, otherwise UB)
  * @find               : character to find
  * @replace            : character to replace @find with
  *
- * Replaces every instance of character @find in @str
+ * Replaces every instance of character @find in @s
  * with character @replace
  **/
-void string_replace_all_chars(char *str, char find, char replace)
+void string_replace_all_chars(char *s, char find, char replace)
 {
-   char *str_ptr = str;
+   char *str_ptr = s;
    while ((str_ptr = strchr(str_ptr, find)))
       *str_ptr++ = replace;
 }
@@ -561,9 +560,9 @@ unsigned string_hex_to_unsigned(const char *str)
    /* Remove leading '0x', if required */
    if (str[0] != '\0' && str[1] != '\0')
    {
-      if ( (str[0] == '0') &&
-          ((str[1] == 'x') ||
-           (str[1] == 'X')))
+      if (     (str[0] == '0')
+           && ((str[1] == 'x')
+           ||  (str[1] == 'X')))
       {
          hex_str = str + 2;
          if (string_is_empty(hex_str))
@@ -610,11 +609,11 @@ int string_count_occurrences_single_character(const char *str, char c)
  *
  * Replaces all spaces with given character @c.
  **/
-void string_replace_whitespace_with_single_character(char *str, char c)
+void string_replace_whitespace_with_single_character(char *s, char c)
 {
-   for (; *str; str++)
-      if (ISSPACE(*str))
-         *str = c;
+   for (; *s; s++)
+      if (ISSPACE(*s))
+         *s = c;
 }
 
 /**
@@ -624,18 +623,18 @@ void string_replace_whitespace_with_single_character(char *str, char c)
  *
  * Replaces multiple spaces with a single space in a string.
  **/
-void string_replace_multi_space_with_single_space(char *str)
+void string_replace_multi_space_with_single_space(char *s)
 {
-   char *str_trimmed  = str;
+   char *str_trimmed  = s;
    bool prev_is_space = false;
    bool curr_is_space = false;
 
-   for (; *str; str++)
+   for (; *s; s++)
    {
-      curr_is_space  = ISSPACE(*str);
+      curr_is_space  = ISSPACE(*s);
       if (prev_is_space && curr_is_space)
          continue;
-      *str_trimmed++ = *str;
+      *str_trimmed++ = *s;
       prev_is_space  = curr_is_space;
    }
    *str_trimmed = '\0';
@@ -648,12 +647,12 @@ void string_replace_multi_space_with_single_space(char *str)
  *
  * Remove all spaces from the given string.
  **/
-void string_remove_all_whitespace(char *str_trimmed, const char *str)
+void string_remove_all_whitespace(char *s, const char *str)
 {
    for (; *str; str++)
       if (!ISSPACE(*str))
-         *str_trimmed++ = *str;
-   *str_trimmed = '\0';
+         *s++ = *str;
+   *s = '\0';
 }
 
 /**
@@ -689,10 +688,10 @@ int string_find_index_substring_string(const char *str, const char *substr)
  *
  * Strips non-ASCII characters from a string.
  **/
-void string_copy_only_ascii(char *str_stripped, const char *str)
+void string_copy_only_ascii(char *s, const char *str)
 {
    for (; *str; str++)
       if (*str > 0x1F && *str < 0x7F)
-         *str_stripped++ = *str;
-   *str_stripped = '\0';
+         *s++ = *str;
+   *s = '\0';
 }
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index cf227e89bd..4650a992e3 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -153,7 +153,7 @@ typedef struct menu_file_list_cbs
          unsigned *w, unsigned type, unsigned i,
          const char *label, char *s, size_t len,
          const char *path,
-         char *path_buf, size_t path_buf_size);
+         char *s2, size_t len2);
    menu_search_terms_t search;
    enum msg_hash_enums enum_idx;
    char action_sublabel_cache[MENU_LABEL_MAX_LENGTH];